Mercurial > hg
log tests/test-merge-types.t @ 21266:19d6fec60b81
| age | author | description |
|---|---|---|
| Fri, 18 Apr 2014 22:19:25 -0700 | Gregory Szorc | resolve: print message when no unresolved files remain (issue4214) |
| Tue, 25 Feb 2014 20:30:08 +0100 | Mads Kiilerich | merge: use ancestor filename from planning phase instead of filectx ancestor |
| Fri, 08 Feb 2013 15:23:23 +0000 | Siddharth Agarwal | manifestmerge: pass in branchmerge and force separately |
| Thu, 24 Jan 2013 23:57:44 +0100 | Mads Kiilerich | merge: delay debug messages for merge actions |
| Wed, 30 Jan 2013 19:29:36 +0100 | Mads Kiilerich | merge: fix UnboundLocalError (issue3791) stable |
| Wed, 09 Jan 2013 02:02:45 +0100 | Mads Kiilerich | merge: merge file flags together with file content |
| Tue, 15 Jan 2013 01:05:12 +0100 | Mads Kiilerich | tests: better test coverage of merges of flags |