Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rename-merge2.out
changeset 3292 764688cf51e5
parent 3282 438b0638dbf5
child 3299 e7abcf3a7c5f 
--- a/tests/test-rename-merge2.out	Sat Oct 07 15:16:47 2006 -0400
+++ b/tests/test-rename-merge2.out	Sun Oct 08 19:57:45 2006 -0500
@@ -42,6 +42,7 @@
 --------------
 M a
 M b
+  a
 --------------
 
 --------------
@@ -85,6 +86,7 @@
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 --------------
 
 --------------
@@ -128,6 +130,7 @@
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 C a
 --------------
 
@@ -172,6 +175,7 @@
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 --------------
 
 --------------
@@ -430,6 +434,7 @@
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 --------------
 
 --------------
@@ -452,6 +457,7 @@
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 M c
 --------------
mercurial