tests/test-merge3
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 06 Sep 2006 02:13:08 +0200
changeset 3060 aa1cee5b8afb
parent 1933 7544700fd931
permissions -rwxr-xr-x
hgk.py: add an optional file list to debug-diff-tree this solves a problem when hgk was trying to display merges diff

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"