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

hg log

     5

hg grep wah

     6

hg manifest

     7

hg verify