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-largefiles.t
changeset 20297 8f412d034173
parent 20296 675f578856dd
child 20471 ea005e754c9c
child 20858 bc56ec9e64df 
--- a/tests/test-largefiles.t	Sat Nov 16 15:46:29 2013 -0500
+++ b/tests/test-largefiles.t	Sat Nov 16 15:46:29 2013 -0500
@@ -1375,7 +1375,9 @@
   2 largefiles cached
   $ hg merge
   largefile sub/large4 has a merge conflict
-  keep (l)ocal or take (o)ther? l
+  ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
+  keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or
+  take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   getting changed largefiles
mercurial