Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-backout.out @ 3044:fcadf7a32425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Sun, 03 Sep 2006 06:06:02 -0400
parents 2ace3bf43089
children e8ee8fdeddb1
comparison
equal deleted inserted replaced
3043:2a4d4aecb2b4 3044:fcadf7a32425
25 adding a 25 adding a
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 -m" if you want to auto-merge) 30 (use "backout --merge" if you want to auto-merge)
31 b: No such file or directory 31 b: No such file or directory
32 adding a 32 adding a
33 adding b 33 adding b
34 adding c 34 adding c
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved