view tests/test-merge3.out @ 776:7635a3f14ad4

Add template to mktemp call Based on a patch from Soh Tk-r28629
author mpm@selenic.com
date Tue, 26 Jul 2005 19:27:05 -0800
parents 122449dd89db
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

+ 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'
adding .out
removing b
b never committed!