tests/test-merge3
author Matt Mackall <mpm@selenic.com>
Mon, 09 Oct 2006 23:23:25 -0500
changeset 3309 488d3062d225
parent 1933 7544700fd931
permissions -rwxr-xr-x
merge: eliminate nodes from action list - eliminate my and other from merge and copy - eliminate node from get - use mctx for get - fix bug flag = a[2:] - pass mctx to recordupdates - use new filectx.size in recordupdates

#!/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"