Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
[gitweb.git]
/
t
/
t4013
/
diff.log_-p_master
diff --git
a/t/t4013/diff.log_-p_master
b/t/t4013/diff.log_-p_master
index f8fefef2c3869337ba048d5cd6d95169dc60cf00..bf1326dc36629096fc4e4102375c8a9c550391aa 100644
(file)
--- a/
t/t4013/diff.log_-p_master
+++ b/
t/t4013/diff.log_-p_master
@@
-1,6
+1,6
@@
$ git log -p 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