X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=t%2Ft4013%2Fdiff.log_--decorate_--all;fp=t%2Ft4013%2Fdiff.log_--decorate_--all;h=1cbdc038f41c84cba220782ab10ae1857b9bc717;hp=f5e20e1e14aaef179ac9570b0e16bc47077ff79d;hb=11cbda2add5d3eb7c415f1f6dd8186181a7f9874;hpb=480e78595ea531482018826d35fed0fb0529afa2 diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all index f5e20e1e14..1cbdc038f4 100644 --- a/t/t4013/diff.log_--decorate_--all +++ b/t/t4013/diff.log_--decorate_--all @@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9 Author: A U Thor Date: Mon Jun 26 00:04:00 2006 +0000 - Merge branch 'side' + Merge branch 'side' into master commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side) Author: A U Thor