projects
/
git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'en/typofixes' into master
[git]
/
t
/
t4013
/
diff.show_-c_master
diff --git
a/t/t4013/diff.show_-c_master
b/t/t4013/diff.show_-c_master
index
81aba8d
..
1c46ed6
100644
(file)
--- a/
t/t4013/diff.show_-c_master
+++ b/
t/t4013/diff.show_-c_master
@@
-4,7
+4,7
@@
Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
- Merge branch 'side'
+ Merge branch 'side'
into master
diff --combined dir/sub
index cead32e,7289e35..992913c