Wed, 03 May 2017 10:43:59 -0700 |
Durham Goode |
rebase: use matcher to optimize manifestmerge
|
Wed, 15 Mar 2017 23:21:30 +0900 |
Yuya Nishihara |
templatekw: make join() escape values of extras (BC) (issue5504)
|
Mon, 05 Dec 2016 17:40:01 +0100 |
Gábor Stefanik |
graft: support grafting changes to new file in renamed directory (issue5436)
|
Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
Tue, 25 Oct 2016 21:01:53 +0200 |
Gábor Stefanik |
merge: avoid superfluous filemerges when grafting through renames (issue5407)
stable
|
Tue, 11 Oct 2016 04:39:47 +0200 |
Gábor Stefanik |
copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
|
Wed, 12 Oct 2016 11:54:03 +0200 |
Gábor Stefanik |
checkcopies: handle divergences contained entirely in tca::ctx
|
Thu, 13 Oct 2016 02:19:43 +0200 |
Gábor Stefanik |
mergecopies: invoke _computenonoverlap for both base and tca during merges
|
Wed, 12 Oct 2016 12:41:28 +0200 |
Gábor Stefanik |
tests: introduce tests for grafting through renames
|
Wed, 12 Oct 2016 21:33:45 +0200 |
Gábor Stefanik |
checkcopies: add a sanity check against false-positive copies
|
Tue, 20 Sep 2016 23:48:08 +0000 |
timeless |
localrepo: use single quotes in use warning
|
Thu, 14 Apr 2016 15:19:57 +0000 |
timeless |
graft: use single quotes around command hint
|
Sat, 19 Mar 2016 18:37:10 -0700 |
Simon Farnsworth |
merge: save merge part labels for later reuse
|
Mon, 29 Feb 2016 01:01:20 -0500 |
Matt Harbison |
tests: flag Windows specific lines about background closing as optional
|
Thu, 04 Feb 2016 03:45:44 +0000 |
timeless |
graft: suggest the correct tool to continue (not graft)
|
Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: use portable diff script via extdiff extension
|
Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: make timezone in diff output glob-ed for portability
|
Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: omit -p for external diff via extdiff extension for portability
|
Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
Sun, 17 Jan 2016 19:33:02 +0100 |
Mads Kiilerich |
graft: warn when -r is combined with revisions as positional arguments
|
Thu, 24 Dec 2015 20:46:06 +0000 |
timeless |
graft: hook afterresolvedstates
|
Wed, 02 Dec 2015 06:33:52 +0000 |
timeless |
graft: improve --continue abort message
|
Wed, 02 Dec 2015 06:31:12 +0000 |
timeless |
summary: mention graft
|
Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
Wed, 09 Sep 2015 22:27:48 -0400 |
Matt Harbison |
extdiff: enable -I/-X with --patch
|
Wed, 09 Sep 2015 21:07:38 -0400 |
Matt Harbison |
extdiff: add a --patch argument for diffing changeset deltas
|