Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3407:d2b55e3c4e25
age | author | description |
---|---|---|
Sun, 15 Oct 2006 16:18:09 -0500 | Matt Mackall | merge: if filemerge skips merge, report as updated |
Fri, 13 Oct 2006 17:58:04 -0500 | Matt Mackall | merge: update dirstate correctly for non-branchmerge updates |
Thu, 12 Oct 2006 14:49:19 -0500 | Matt Mackall | merge: turn followcopies on by default |
Tue, 10 Oct 2006 03:39:44 -0500 | Matt Mackall | merge: pull user messages out to hg.py |
Tue, 10 Oct 2006 02:31:02 -0500 | Matt Mackall | merge: update some docstrings |
Tue, 10 Oct 2006 02:15:20 -0500 | Matt Mackall | merge: various tidying |