view tests/test-merge3.out @ 722:e5b39ce2c3c9

Add doc/Makefile to MANIFEST manifest hash: 1fc29da9334caa71ff8df55c52747f9c93df7e0f
author mpm@selenic.com
date Wed, 20 Jul 2005 11:40:27 -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!