mercurial-crew-with-dirclash: tests/test-merge5.out@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).

767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	1	removing b
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	2	this update spans a branch affecting the following files:
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 415 diff changeset	3	b
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	4	aborting update spanning branches!
819 77e121a0d870 Update output for test-merge5. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	5	(use update -m to merge across branches or -C to lose changes)

author	Vincent Danjean
	Fri, 23 Sep 2005 18:59:16 -0700
changeset 1341	3ab6e55ee361
parent 925	5a034646e472
child 2019	ced2d3620f95
permissions	-rw-r--r--