tests/test-rename-dir-merge2.out
author Martin Geisler <mg@lazybytes.net>
Fri, 04 Sep 2009 23:45:13 +0200
changeset 9426 b42b03308ae9
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
test-highlight: remove redundant test Changeset 799373ff2554 is testing how a EUC-JP encoded Japanese file is treated in different encodings, so the ISO-8859-1 encoded German file is no longer needed.

adding a/f
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
moving a/f to b/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