view tests/test-merge3.out @ 814:0902ffece4b4

Merge with BOS
author mpm@selenic.com
date Sat, 30 Jul 2005 09:00:14 -0800
parents 8f5637f0a0c0 122449dd89db
children 5a034646e472
line wrap: on
line source

+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -A -mcomment #1 -d 0 0
removing b
b never committed!
nothing changed