Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 21080:04540a8499a3
| age | author | description |
|---|---|---|
| Sun, 06 Apr 2014 13:39:51 +0200 | Mads Kiilerich | merge: move ancestor selection tweaking from manifestmerge to update function |
| Sun, 13 Apr 2014 19:01:00 +0200 | Mads Kiilerich | spelling: fixes from spell checker |
| Sun, 02 Mar 2014 18:52:16 +0100 | Mads Kiilerich | merge: keep destination filename as key in filemerge actions |
| Sun, 02 Mar 2014 18:49:36 +0100 | Mads Kiilerich | merge: keep destination filename as key in actions for merge with dir rename |
| Fri, 28 Feb 2014 02:38:33 +0100 | Mads Kiilerich | merge: include ancestor node in merge actions |
| Tue, 25 Feb 2014 20:30:08 +0100 | Mads Kiilerich | merge: use ancestor filename from planning phase instead of filectx ancestor |