Mercurial > hg > mercurial-crew-with-dirclash
diff comparison.txt @ 829:764b0350acb8
Shortened hgmerge a little bit.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 17:16:41 +0100 |
parents | 17e66e1a0382 |
children | 2073e5a71008 |