templates/filediff-raw.tmpl
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Mon, 06 Feb 2006 17:32:10 -0600
changeset 1701 4ba8fe499df2
parent 201 f918a6fa2572
permissions -rw-r--r--
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

#header#
#diff#
#footer#