Mercurial Mercurial > hg / 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 7320 8dca507e56ce
parent 6512 368a4ec603cc
child 7768 5bf5fd1e2a74 
--- a/tests/test-rename-merge2.out	Thu Nov 06 11:17:38 2008 +0100
+++ b/tests/test-rename-merge2.out	Fri Nov 07 10:27:39 2008 +0100
@@ -455,6 +455,8 @@
   searching for copies back to rev 1
  b: versions differ -> m
  rev: versions differ -> m
+remote changed a which local deleted
+use (c)hanged version or leave (d)eleted? c
  a: prompt recreating -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
@@ -480,6 +482,8 @@
  overwrite None partial False
  ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
   searching for copies back to rev 1
+ local changed a which remote deleted
+use (c)hanged version or (d)elete? c
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
Mercurial