view tests/test-merge3.out @ 740:d2422f10c136

Merge from BOS manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659
author mpm@selenic.com
date Wed, 20 Jul 2005 20:00:29 -0500
parents 2fe8d66e3075
children 7e4843b7efd2
line wrap: on
line source

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-tcomment #1' -d '0 0' -u user
b never committed!