Refactor to do diff per commit and only show conflicted changes in merges.

[git-central.git] / tests / t2201-8.txt

diff --git a/tests/t2201-8.txt b/tests/t2201-8.txt
index cf26a25..669dedd 100644 (file)
--- a/tests/t2201-8.txt
+++ b/tests/t2201-8.txt
@@ -7,7 +7,7 @@ X-Git-Oldrev: $old_tag_hash
 X-Git-Newrev: 0000000000000000000000000000000000000000
 
 The annotated tag, 2.0 has been deleted
-       was  $old_tag_hash
+       was $old_tag_hash (tag)
 
 -----------------------------------------------------------------------
 tag 2.0