##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Try to find diffstat in PATH before calling it...
Try to find diffstat in PATH before calling it At least on Solaris, /bin/sh will print a "command not found" message even if we redirect stderr.
Matt Mackall - - Load All Authors

File last commit:

r4304:4787e2b0 default
r4316:6e4334be default
Show More
test-rename-dir-merge2.out
21 lines | 502 B | text/plain | TextLexer
/ tests / test-rename-dir-merge2.out
History | Annotation | Raw |Copy content |Copy permalink
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)
merging a/f and b/f
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b/f
a/f
A b/aa/g
a/aa/g
R a/aa/g
R a/f