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.t
changeset 21082 0d67fccc0d43
parent 21024 7731a2281cf0
child 21389 e741972017d9 
--- a/tests/test-rename-merge2.t	Sun Apr 06 13:39:51 2014 +0200
+++ b/tests/test-rename-merge2.t	Mon Apr 07 02:12:28 2014 +0200
@@ -86,6 +86,7 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
+   a: keep -> k
    b: remote copied from a -> m
     preserving a for resolve of b
    rev: versions differ -> m
@@ -570,6 +571,7 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
+   a: keep -> k
    b: versions differ -> m
     preserving b for resolve of b
    rev: versions differ -> m
Mercurial