Mercurial > hg

diff tests/test-simple-update @ 1701:4ba8fe499df2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Mon, 06 Feb 2006 17:32:10 -0600
parents 0902ffece4b4
children ad3d5b4367cb
line wrap: on
line diff