Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3733:9e67fecbfd16
age | author | description |
---|---|---|
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: handle directory renames |
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: pull findcopies helpers inside, refactor checkpair to checkcopies |
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: move check for empty ancestor into findcopies |