changeset 11797 | 66e4e8e8b1e5 |
parent 11796 | 141e2e964705 |
child 11798 | 1ab3d8977bdf |
--- a/tests/test-conflict Thu Aug 12 19:49:58 2010 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -#!/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