tests/test-conflict
author Brodie Rao <me+hg@dackz.net>
Sun, 25 Oct 2009 02:52:35 +0200
changeset 9640 9e76232fbfbe
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
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.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status