diff mercurial/dirstate.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 de8ec7e1753a
children a11921d24ec4 81078e177266
line wrap: on
line diff