Mercurial > hg
view tests/test-rename-dir-merge2.out @ 9730:732fc0e9d411
patchbomb: fix 'echo -en' bashism in test-patchbomb
The echo command doesn't accept options in some shells.
printf is required by the SUSv2 (Single UNIX Specification v2).
author | Marti Raudsepp <marti@juffo.org> |
---|---|
date | Fri, 06 Nov 2009 13:48:17 +0200 |
parents | a3d73b3e1f8a |
children |
line wrap: on
line source
adding a/f updating to branch default 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