Mercurial > hg
view tests/test-commit.out @ 1798:d610fe0e6893
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Thu, 23 Feb 2006 18:10:04 +0100 |
parents | 08c7851969cc |
children | ef53d200df3d |
line wrap: on
line source
transaction abort! rollback completed abort: impossible time zone offset: 4444444 transaction abort! rollback completed abort: invalid date: '1\t15.1' transaction abort! rollback completed abort: invalid date: 'foo bar' transaction abort! rollback completed abort: invalid date: ' 1 4444' transaction abort! rollback completed abort: date exceeds 32 bits: 111111111111 abort: No such file or directory: .../test/bar