Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/templater.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 | e21a0e12ff10 |
| children | 46c5e1ee8aaa |
comparison
equal
deleted
inserted
replaced
| 4844:6215c0296473 | 4845:e4480f2b61e9 |
|---|