ignore files associated with quilt -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 ignore files associated with quilt manifest hash: f0da2c0465fb27005d5bde30e0171ae9a76951d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGpIywK+sNU5EO8RAi+uAJ4/cXWFBnXoLHH8bN8Xbe/nzXHycgCfQkO2 WdEoWI4YpiNQ+s5id6Xxphw= =6cXJ -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

     3

set -x

     4

hg init

     5

echo "nothing" > a

     6

hg add a

     7

hg commit -t ancestor -u test -d "0 0"

     8

echo "something" > a

     9

hg commit -t branch1 -u test -d "0 0"

    10

hg co 0

    11

echo "something else" > a

    12

hg commit -t branch2 -u test -d "0 0"

    13

export HGMERGE=merge

    14

hg -d up -m 1

    15

hg id

    16

cat a | grep -v ">>>" | grep -v "<<<"

    17

hg status