Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-unrelated-pull.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 | 9344f5dd4488 |
children | 7544700fd931 |
line wrap: on
line source
pulling from ../a searching for changes warning: pulling from an unrelated repository! adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg update' to get a working copy) changeset: 1:9a79c33a9db3 tag: tip user: a date: Thu Jan 1 00:00:00 1970 +0000 summary: a changeset: 0:01f8062b2de5 user: b date: Thu Jan 1 00:00:00 1970 +0000 summary: b