Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
filter-branch: use git-sh-setup's ident parsing functions
[gitweb.git]
/
t
/
t4013
/
diff.show_master
diff --git
a/t/t4013/diff.show_master
b/t/t4013/diff.show_master
index 9e6e1f27105ca50262e5eb3f2ff132b46c12fe45..fb08ce0e46d16d223269754295cc4a8dc4364268 100644
(file)
--- a/
t/t4013/diff.show_master
+++ b/
t/t4013/diff.show_master
@@
-1,6
+1,6
@@
$ git show master
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
-Merge: 9a6d494
... c7a2ab9...
+Merge: 9a6d494
c7a2ab9
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000