Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 4889:d69b1fb111b9
age | author | description |
---|---|---|
Thu, 05 Jul 2007 16:01:07 -0500 | Matt Mackall | merge: fix adding untracked files on directory rename (issue612) |
Thu, 05 Jul 2007 13:34:18 -0500 | Matt Mackall | merge: make test for fast-forward merge stricter (issue619) |
Fri, 22 Jun 2007 20:44:40 -0300 | Alexis S. L. Carvalho | merge: fix small bug with a failed merge across a rename |