tests/test-merge3.out
author mpm@selenic.com
Sat, 23 Jul 2005 10:00:56 -0500
changeset 768 20e95c245bc3
parent 767 61ed30e82b27
child 775 122449dd89db
permissions -rw-r--r--
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-mcomment #1' -d '0 0'
removing b
b never committed!