Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-backout.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 6c9305fbebaf
line wrap: on
line diff
--- a/tests/test-backout.out
+++ b/tests/test-backout.out
@@ -16,4 +16,6 @@ adding a
 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
 merging with changeset 2:b66ea5b77abb
 merging a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 line 1