From: Felipe Contreras Date: Wed, 13 May 2009 21:22:06 GMT Subject: [PATCH 3/3] Fix test for new log decorate Message-ID: <1242249726-8514-4-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1242249726-8514-3-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- t/t4013/diff.log_--decorate_--all | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all index 12da8ac..954210e 100644 --- a/t/t4013/diff.log_--decorate_--all +++ b/t/t4013/diff.log_--decorate_--all @@ -1,12 +1,12 @@ $ git log --decorate --all -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (refs/heads/master) +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (master) Merge: 9a6d494 c7a2ab9 Author: A U Thor Date: Mon Jun 26 00:04:00 2006 +0000 Merge branch 'side' -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side) +commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side) Author: A U Thor Date: Mon Jun 26 00:03:00 2006 +0000 @@ -26,7 +26,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000 This is the second commit. -commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial) +commit 444ac553ac7612cc88969031b02b3767fb8a353a (initial) Author: A U Thor Date: Mon Jun 26 00:00:00 2006 +0000 -- 1.6.3.1