Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-filebranch.out @ 1922:6d50d6189269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 13 Mar 2006 08:56:59 +0100
parents 9344f5dd4488
children 7544700fd931
comparison
equal deleted inserted replaced
1921:acce3f7e1779 1922:6d50d6189269
17 merging for foo 17 merging for foo
18 resolving manifests 18 resolving manifests
19 getting bar 19 getting bar
20 merging foo 20 merging foo
21 resolving foo 21 resolving foo
22 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
23 (branch merge, don't forget to commit)
22 we shouldn't have anything but foo in merge state here 24 we shouldn't have anything but foo in merge state here
23 m 644 3 foo 25 m 644 3 foo
24 main: we should have a merge here 26 main: we should have a merge here
25 rev offset length base linkrev nodeid p1 p2 27 rev offset length base linkrev nodeid p1 p2
26 0 0 73 0 0 cdca01651b96 000000000000 000000000000 28 0 0 73 0 0 cdca01651b96 000000000000 000000000000