Mercurial > hg
log mercurial/merge.py @ 20642:0dc7a50345c2
| age | author | description |
|---|---|---|
| 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 |
| Sat, 01 Mar 2014 18:09:39 +0100 | Mads Kiilerich | merge: audit the right destination file when merging with dir rename stable 2.9.1 |
| Fri, 28 Feb 2014 02:28:12 +0100 | Olle Lundberg | merge: fix spelling of length |
| Tue, 25 Feb 2014 18:45:01 -0800 | Pierre-Yves David | resolve: use "other" changeset from merge state (issue4163) stable |