Sun, 15 Nov 2015 21:40:15 -0800 |
Siddharth Agarwal |
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
|
Fri, 13 Nov 2015 23:52:26 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':prompt' tool
|
Wed, 18 Nov 2015 15:41:50 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':other' merge tool
|
Wed, 18 Nov 2015 15:40:28 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':local' merge tool
|
Thu, 19 Nov 2015 10:50:02 -0800 |
Siddharth Agarwal |
merge.mergestate: compute dirstate action
|
Wed, 18 Nov 2015 14:22:52 -0800 |
Siddharth Agarwal |
filemerge: return whether the file was deleted
|
Wed, 18 Nov 2015 13:55:31 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted from all other merge tools
|
Wed, 18 Nov 2015 13:52:28 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted for nomerge internal tools
|
Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: allow storing and retrieving change/delete conflicts
|
Thu, 19 Nov 2015 12:50:10 +0530 |
Shubhanshu Agrawal |
strip: changing bookmark argument to be a list
|
Sun, 15 Nov 2015 21:03:44 +0530 |
Shubhanshu Agrawal |
strip: strip a list of bookmarks
|
Wed, 18 Nov 2015 23:23:03 -0800 |
Pierre-Yves David |
revset: speed up '_matchfiles'
|
Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: handle additional record types specially
|
Wed, 18 Nov 2015 23:42:32 -0800 |
Siddharth Agarwal |
test-resolve.t: remove completely unnecessary line
|
Wed, 18 Nov 2015 23:43:18 -0800 |
Siddharth Agarwal |
resolve: fix incorrect merge
|
Wed, 18 Nov 2015 20:55:32 +0100 |
liscju |
fileset: add missing() predicate (issue4925)
|
Tue, 10 Nov 2015 17:22:40 +0800 |
Anton Shestakov |
webutil: make _siblings into an object with __iter__ and __len__
|
Wed, 18 Nov 2015 16:39:30 -0800 |
Siddharth Agarwal |
mergestate: move binary format documentation into _readrecordsv2
|
Wed, 18 Nov 2015 15:11:23 -0800 |
Siddharth Agarwal |
unshelve: add support for custom merge tools
|
Wed, 18 Nov 2015 15:18:16 -0800 |
Siddharth Agarwal |
unshelve: shed spurious space
|
Wed, 18 Nov 2015 15:04:03 -0800 |
Siddharth Agarwal |
unshelve: add -k as short form of --keep
|
Sun, 01 Nov 2015 13:55:21 +0900 |
Yuya Nishihara |
import-checker: allow symbol imports from hgweb.common and .request
|
Thu, 19 Nov 2015 15:02:27 -0600 |
Matt Mackall |
perf: un-bitrot perfstatus
|
Thu, 19 Nov 2015 13:15:17 -0600 |
Matt Mackall |
util: drop statmtimesec
|
Thu, 19 Nov 2015 13:21:24 -0600 |
Matt Mackall |
util: disable floating point stat times (issue4836)
|
Wed, 18 Nov 2015 15:58:06 -0800 |
Laurent Charignon |
rebase: refactoring to avoid repetition of expression
|
Wed, 18 Nov 2015 16:06:00 -0800 |
Laurent Charignon |
rebase: remove an unused todo
|
Wed, 18 Nov 2015 13:44:29 -0800 |
Laurent Charignon |
rebase: don't rebase obsolete commits with no successor
|
Wed, 18 Nov 2015 13:46:42 -0800 |
Laurent Charignon |
rebase: fix a typo in test-rebase-obsolete
|
Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|