X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4013%2Fdiff.show_master;h=9e6e1f27105ca50262e5eb3f2ff132b46c12fe45;hb=c636d0e2bcffdbd55c096944561d9ac470da600e;hp=3772a87e136abde3c1172d5e1760de8a107646bd;hpb=a3d470c2d5a4da60184928ccbdb1fb3708ceab16;p=git.git diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master index 3772a87e1..9e6e1f271 100644 --- a/t/t4013/diff.show_master +++ b/t/t4013/diff.show_master @@ -1,6 +1,6 @@ $ git show master -commit 176b998f5d647cbd77a9d8acf4531e930754d16d -Merge: 889b315... c7a2ab9... +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 +Merge: 9a6d494... c7a2ab9... Author: A U Thor Date: Mon Jun 26 00:04:00 2006 +0000