tests/test-issue619.out
author Brodie Rao <me+hg@dackz.net>
Sun, 25 Oct 2009 02:52:35 +0200
changeset 9640 9e76232fbfbe
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
diff: add --stat for diffstat output diff/qdiff --stat invokes patch.diffstat() on the diff output. When in interactive mode, the output's maximum width is determined by the terminal's width.

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done