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

     5

echo "Is there an error message when trying to diff non-existing files?"

     6

hg diff not found

     7

     8

echo "Is there an error message when trying to add non-existing files?"

     9

hg add not found