Sun, 11 Mar 2018 20:10:38 +0900 |
Yuya Nishihara |
amend: abort if unresolved merge conflicts found (issue5805)
stable
|
Sun, 14 Jan 2018 23:59:17 -0800 |
Martin von Zweigbergk |
evolution: report new unstable changesets
|
Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
Tue, 28 Nov 2017 05:50:45 +0530 |
Pulkit Goyal |
rewriteutil: use precheck() in uncommit and amend commands
|
Thu, 28 Sep 2017 18:56:40 +0100 |
Boris Feld |
config: use 'experimental.evolution.allowunstable'
|
Thu, 28 Sep 2017 18:19:06 +0100 |
Boris Feld |
config: use 'experimental.evolution.create-markers'
|
Fri, 01 Sep 2017 12:34:36 -0700 |
Saurabh Singh |
cmdutil: remove the redundant commit during amend
|
Fri, 01 Sep 2017 12:34:34 -0700 |
Saurabh Singh |
amend: add tests for amending only some files from commit to be amended
|
Thu, 03 Aug 2017 13:48:39 +0200 |
Boris Feld |
revset: rename unstable into orphan
|
Fri, 04 Aug 2017 18:41:16 +0200 |
Boris Feld |
test: update evolution config
|
Tue, 01 Aug 2017 17:53:48 +0200 |
Boris Feld |
evolution: rename unstable to orphan
|
Tue, 01 Aug 2017 17:39:28 +0200 |
Boris Feld |
evolution: rename trouble(s) to instability
|
Mon, 26 Jun 2017 15:28:28 -0700 |
Jun Wu |
amend: use scmutil.cleanupnodes (BC)
|
Mon, 02 Jan 2017 11:50:17 -0800 |
Gregory Szorc |
revlog: make compressed size comparisons consistent
|
Mon, 10 Oct 2016 12:06:58 +0200 |
Denis Laxalde |
cmdutil: add support for evolution "troubles" display in changeset_printer
|
Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
Tue, 15 Nov 2016 21:56:49 +0100 |
Mads Kiilerich |
bdiff: give slight preference to appending lines
|
Tue, 08 Nov 2016 18:37:33 +0100 |
Mads Kiilerich |
bdiff: give slight preference to longest matches in the middle of the B side
|
Sun, 30 Oct 2016 06:15:09 +0900 |
FUJIWARA Katsunori |
tests: test preserving execbit changes at amending only on execbit platform
stable
|
Fri, 14 Oct 2016 01:31:11 +0200 |
Pierre-Yves David |
changegroup: skip delta when the underlying revlog do not use them
|
Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
Thu, 19 May 2016 14:35:22 -0700 |
Mateusz Kwapich |
localrepo: prevent executable-bit only changes from being lost on amend
stable
|
Wed, 23 Mar 2016 13:34:47 -0700 |
Martijn Pieters |
graphmod: set default edge styles for ascii graphs (BC)
|
Wed, 23 Dec 2015 12:41:20 -0800 |
Siddharth Agarwal |
tests: explicitly request changed version in c/d conflict in test-commit-amend.t
|
Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
Tue, 20 Oct 2015 12:09:18 +0200 |
Pierre-Yves David |
test: use general delta for 'test-commit-amend.t'
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
cmdutil: make in-memory changes visible to external editor (issue4378)
|
Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
Mon, 01 Jun 2015 14:47:02 -0500 |
Matt Mackall |
merge with stable
|