Mercurial > hg > mercurial-crew-with-dirclash
diff hgmerge @ 792:49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 23 Jul 2005 17:14:05 +0100 |
parents | 4fc63e22b1fe |
children | cd0ad12d9e42 8f5637f0a0c0 0902ffece4b4 |