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).
1:f4d7a8c73d23
0:232e179b3f29
f4d7a8c73d23 tip
232e179b3f29
232e179b3f29+
232e179b3f29
f4d7a8c73d23 tip
merge: warning: conflicts during merge
merging file1
merging file1 failed!
diff -r f4d7a8c73d23 file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@
added file1
another line of text
+<<<<<<<
+changed file1 different
+=======
changed file1
+>>>>>>>
M file1
f4d7a8c73d23+ tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip