Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-backout.out @ 4195:b5d1eaade333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge a bunch of matcher and locate fixes.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 10 Mar 2007 23:21:33 -0300
parents e8ee8fdeddb1
children 934275cd4526
comparison
equal deleted inserted replaced
4177:ba51a8225a60 4195:b5d1eaade333
26 adding b 26 adding b
27 reverting a 27 reverting a
28 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5 28 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
29 the backout changeset is a new head - do not forget to merge 29 the backout changeset is a new head - do not forget to merge
30 (use "backout --merge" if you want to auto-merge) 30 (use "backout --merge" if you want to auto-merge)
31 b: No such file or directory
32 adding a 31 adding a
33 adding b 32 adding b
34 adding c 33 adding c
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 34 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
36 adding d 35 adding d