Mercurial > hg
log mercurial/merge.py @ 20792:89059c450c56
| age | author | description |
|---|---|---|
| Fri, 28 Feb 2014 02:26:03 +0100 | Mads Kiilerich | merge: mark mergestate as dirty when resolve changes _state |
| Wed, 05 Mar 2014 10:49:43 -0800 | Pierre-Yves David | merge: adds documentation to the mergestate class |
| Wed, 05 Mar 2014 10:22:43 -0800 | Pierre-Yves David | merge: add blank line between mergestate's method |
| Tue, 25 Feb 2014 20:29:46 +0100 | Mads Kiilerich | merge: use the right ancestor when both sides copied the same file |
| Sun, 02 Mar 2014 18:36:02 +0100 | Mads Kiilerich | merge: handle create+delete prompts in calculateupdates |
| Fri, 28 Feb 2014 02:26:03 +0100 | Mads Kiilerich | merge: handle acceptremove of create+delete early in manifest merge |
| Sat, 01 Mar 2014 21:08:28 -0500 | Augie Fackler | merge with stable |