Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-notfound @ 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 | 891b6a262c4b |
children |
line wrap: on
line source
#!/bin/sh hg init echo "Is there an error message when trying to diff non-existing files?" hg diff not found echo "Is there an error message when trying to add non-existing files?" hg add not found