Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 1701:4ba8fe499df2
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 | ece5d785e87a |
| children | d457fec76ab0 |
comparison
equal
deleted
inserted
replaced
| 1700:e2f91e0acbb8 | 1701:4ba8fe499df2 |
|---|