Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
2177:6886bc0b77af 2178:00205fe76993
14 # backout with merge 14 # backout with merge
15 adding a 15 adding a
16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
17 merging with changeset 2:b66ea5b77abb 17 merging with changeset 2:b66ea5b77abb
18 merging a 18 merging a
19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
20 (branch merge, don't forget to commit)
19 line 1 21 line 1