Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 21545:43eecb4e23f8
| age | author | description |
|---|---|---|
| Fri, 28 Feb 2014 02:25:58 +0100 | Mads Kiilerich | merge: use separate lists for each action type |
| Thu, 08 May 2014 16:54:23 -0700 | Durham Goode | merge: add labels parameter from merge.update to filemerge |
| Fri, 09 May 2014 12:01:56 +0200 | Mads Kiilerich | merge: separate worker functions for batch remove and batch get |
| Tue, 22 Apr 2014 02:10:25 +0200 | Mads Kiilerich | merge: change debug logging - test output changes but no real changes |
| Thu, 15 May 2014 02:14:59 +0200 | Mads Kiilerich | merge: move constant assignments a bit and use them more |
| Fri, 02 May 2014 01:09:14 +0200 | Mads Kiilerich | merge: change priority / ordering of merge actions |