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

#!/bin/sh

     2

     3

hg init

     4

echo "nothing" > a

     5

hg add a

     6

hg commit -m ancestor -d "0 0"

     7

echo "something" > a

     8

hg commit -m branch1 -d "0 0"

     9

hg co 0

    10

echo "something else" > a

    11

hg commit -m branch2 -d "0 0"

    12

HGMERGE=merge; export HGMERGE

    13

hg up -m 1

    14

hg id

    15

grep -Ev ">>>|<<<" a

    16

hg status