Mercurial > hg
log mercurial/merge.py @ 21389:e741972017d9
| age | author | description |
|---|---|---|
| Fri, 02 May 2014 01:09:14 +0200 | Mads Kiilerich | merge: change priority / ordering of merge actions |
| Tue, 22 Apr 2014 02:09:24 +0200 | Mads Kiilerich | merge: make debug output slightly more helpful by including message for action |
| Sun, 13 May 2012 17:45:08 +0200 | Mads Kiilerich | merge: simplify mergestate iter |
| Fri, 18 Apr 2014 22:19:25 -0700 | Gregory Szorc | resolve: print message when no unresolved files remain (issue4214) |
| Fri, 18 Apr 2014 19:08:32 -0700 | Gregory Szorc | resolve: abort when not applicable (BC) |
| Thu, 08 May 2014 16:48:28 -0700 | Gregory Szorc | mergestate: consistently set variables to None |
| Wed, 30 Apr 2014 14:19:01 -0500 | Matt Mackall | ancestor: silence multiple ancestor warning outside of merge (issue4234) stable |