| Thu, 12 Nov 2015 14:29:02 -0800 |
Siddharth Agarwal |
merge.applyupdates: only attempt to merge files in mergeactions
|
| Wed, 11 Nov 2015 17:34:28 -0800 |
Siddharth Agarwal |
filemerge: rename _symlinkcheck to _mergecheck
|
| Wed, 11 Nov 2015 17:32:41 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: rename to test-merge-changedelete.t
|
| Thu, 12 Nov 2015 20:48:41 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 12 Nov 2015 13:16:04 -0800 |
Gregory Szorc |
tags: create new sortdict for performance reasons
stable
|
| Tue, 10 Nov 2015 15:08:56 -0800 |
Christian Delahousse |
largefiles: specify where .orig files are kept
|
| Tue, 10 Nov 2015 14:52:54 -0800 |
Christian Delahousse |
mq: let the user choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:41:14 -0800 |
Christian Delahousse |
shelve: choose where .orig file locations are kept
|
| Tue, 10 Nov 2015 16:25:59 -0800 |
Christian Delahousse |
filemerge: choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:29:13 -0800 |
Christian Delahousse |
git-subrepos: revert respects specified location to save .orig files
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
| Thu, 12 Nov 2015 17:00:08 -0600 |
Christian Delahousse |
revert: allow configuring the .orig file location
|
| Thu, 12 Nov 2015 16:56:06 -0600 |
Christian Delahousse |
cmdutil: add origbackuppath helper
|
| Tue, 10 Nov 2015 11:16:25 -0800 |
Ryan McElroy |
discovery: pass pushop to _nowarnheads
|
| Tue, 10 Nov 2015 11:13:21 -0800 |
Ryan McElroy |
exchange: pass pushop to discovery.checkheads
|
