Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3441:ef2e990f9047
age | author | description |
---|---|---|
Tue, 17 Oct 2006 22:34:43 -0500 | Matt Mackall | imported patch foo |
Sun, 15 Oct 2006 16:18:09 -0500 | Matt Mackall | merge: if filemerge skips merge, report as updated |