tests/test-rename-dir-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 08 Jul 2007 19:59:02 +0200
changeset 4847 2192001e4bb4
parent 4416 bb1800a7d7e1
permissions -rw-r--r--
Add --line-number option to hg annotate (issue506) Line numbers are separated from the last annotation element with a colon, like with many other commands, e.g. (hg) grep or compiler errors. Idea and tests by FUJIWARA Katsunori.

adding a/f
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
copying a/f to b/f
removing a/f
adding a/aa/g
pulling from ../r2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b/f
A b/aa/g
  a/aa/g
R a/aa/g
R a/f