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

Fix copyright symbol in docs --- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700 +++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700 @@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL). Index: hg/doc/hgmerge.1.txt =================================================================== --- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700 +++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700 @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).

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	Vincent Danjean
	Fri, 23 Sep 2005 18:59:16 -0700
changeset 1341	3ab6e55ee361
parent 814	0902ffece4b4
child 1933	7544700fd931
permissions	-rwxr-xr-x