git.droids-corp.org
/
git-central.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Refactor to do diff per commit and only show conflicted changes in merges.
[git-central.git]
/
tests
/
t2201-4.txt
diff --git
a/tests/t2201-4.txt
b/tests/t2201-4.txt
index
af4bc95
..
0cc9d47
100644
(file)
--- a/
tests/t2201-4.txt
+++ b/
tests/t2201-4.txt
@@
-7,7
+7,7
@@
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: $new_commit_hash
The tag, 2.1 has been created
- at
$new_commit_hash (commit)
+ at $new_commit_hash (commit)
- Log -----------------------------------------------------------------
commit $new_commit_hash