mercurial-crew-with-dirclash: tests/test-merge3@df25ee778ac2 (annotated)

800 ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris. Thomas Arendsen Hein <thomas@intevation.de> parents: 749 diff changeset	1	#!/bin/sh
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	2
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	3	hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	4	echo This is file a1 > a
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	5	hg add a
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 402 diff changeset	6	hg commit -m "commit #0" -d "0 0"
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	7	touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	8	hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	9	rm b
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 402 diff changeset	10	hg commit -A -m"comment #1" -d "0 0"

author	Ollivier Robert <roberto@keltia.freenix.fr>
	Sat, 27 Aug 2005 23:43:08 -0700
changeset 1120	df25ee778ac2
parent 814	0902ffece4b4
child 1933	7544700fd931
permissions	-rwxr-xr-x