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

hg init

     4

echo 123 > a

     5

hg add a

     6

hg commit -m "first" -d "0 0" a

     7

mkdir sub

     8

echo 321 > sub/b

     9

hg add sub/b

    10

hg commit -m "second" -d "0 0" sub/b

    11

cat sub/b

    12

hg co 0

    13

cat sub/b

    14

ls sub

    15

    16

true