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
Get tests passing again.
[git-central.git]
/
tests
/
t2204-1.txt
diff --git
a/tests/t2204-1.txt
b/tests/t2204-1.txt
index
8e5bef1
..
6a9433b
100644
(file)
--- a/
tests/t2204-1.txt
+++ b/
tests/t2204-1.txt
@@
-17,7
+17,7
@@
revisions in full, below.
- Log -----------------------------------------------------------------
commit $new_commit_hash
-Merge: $old_commit_
hash $stable_hash
+Merge: $old_commit_
abbrev $stable_abbrev
Author: A U Thor <author@example.com>
Date: $new_commit_date