tests/test-merge2.out
author Samuel Tardieu <sam@rfc1149.net>
Sat, 06 Aug 2005 21:18:21 +0100
changeset 850 d2bf8b9534b1
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Add temporary documentation files and profiling output to .hgignore

+ 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 b
+ hg commit -m commit #2 -d 0 0
+ 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 commit -A -m commit #2 -d 0 0
adding b
+ 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 remove b
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b