Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/archival.py @ 4845:e4480f2b61e9
Check for conflict markers in hgmerge (issue471)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 08 Jul 2007 13:44:41 +0200 |
parents | 1d5a2ee683b0 |
children | 74f36b1027f4 |