view tests/test-merge3.out @ 800:ec85f9e6f3b1

Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:19:43 +0100
parents 122449dd89db
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-mcomment #1' -d '0 0'
adding .out
removing b
b never committed!