hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

echo a > a

     7

hg add a

     8

hg commit -m "test" -d "0 0"

     9

hg verify

    10

hg parents

    11

hg status

    12

hg undo

    13

hg verify

    14

hg parents

    15

hg status