view tests/test-merge4.out @ 896:01215ad04283

Merge with BOS
author mpm@selenic.com
date Sat, 13 Aug 2005 19:43:42 -0800
parents 0902ffece4b4
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 -m commit #1 -d 0 0
+ hg update 0
+ hg add c
+ hg commit -m commit #2 -d 0 0
+ hg update -m 1
+ hg commit -m commit #3 -d 0 0