| Tue, 13 Oct 2015 00:16:25 +0200 |
Mads Kiilerich |
merge: abort on file/directory case folding collisions (issue4892)
|
| Tue, 13 Oct 2015 00:16:25 +0200 |
Mads Kiilerich |
tests: test of case-folding merge collisions
|
| Wed, 19 Aug 2015 15:40:13 -0500 |
Matt Mackall |
copies: group bothnew with other sets
|
| Wed, 19 Aug 2015 15:32:27 -0500 |
Matt Mackall |
copies: rename renamedelete to renamedeleteset for clarity
|
| Wed, 19 Aug 2015 15:26:08 -0500 |
Matt Mackall |
copies: move _makegetfctx calls into checkcopies
|
| Wed, 19 Aug 2015 15:17:33 -0500 |
Matt Mackall |
copies: factor out setupctx into _makegetfctx
|
| Fri, 21 Aug 2015 15:12:58 -0500 |
Matt Mackall |
copies: avoid reference to c1/c2 in makectx
|
| Mon, 12 Oct 2015 03:37:09 -0500 |
Matt Mackall |
mq: use cmdutil.revert instead of hg.revert
|
| Wed, 30 Sep 2015 21:48:53 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out driver-resolved files
|
| Wed, 30 Sep 2015 21:47:27 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out merge driver
|
| Wed, 30 Sep 2015 19:43:51 -0700 |
Siddharth Agarwal |
merge.mergedriver: don't try resolving files marked driver-resolved
|
| Mon, 28 Sep 2015 18:34:06 -0700 |
Siddharth Agarwal |
merge.mergestate: add support for persisting driver-resolved files
|
