| Wed, 03 Feb 2016 13:52:04 +0000 |
timeless |
histedit: limit updated and merging output to important updates
|
| Wed, 23 Dec 2015 08:57:04 +0000 |
timeless |
histedit: list action when intervention is required
|
| Thu, 24 Dec 2015 20:41:17 +0000 |
timeless |
histedit: hook afterresolvedstates
|
| Mon, 14 Dec 2015 22:37:31 +0000 |
timeless |
histedit: omit useless message from update (_histedit)
|
| Mon, 14 Dec 2015 21:43:16 +0000 |
timeless |
histedit: omit useless message from update (histeditaction)
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Sat, 04 Apr 2015 11:39:08 -0700 |
Durham Goode |
histedit: convert pick action into a class
|
| Wed, 06 Aug 2014 16:51:41 -0400 |
Mike Edgar |
histedit: add "roll" command to fold commit data and drop message (issue4256)
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
| Tue, 16 Apr 2013 21:57:25 -0500 |
Pierre-Yves David |
histedit-test: generalise --commands "-" usage
|
| Fri, 08 Feb 2013 16:27:49 -0600 |
Augie Fackler |
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
|
| Wed, 16 Jan 2013 19:14:22 +0100 |
Pierre-Yves David |
histedit: record histedit source (issue3681)
|
| Fri, 21 Sep 2012 19:27:22 +0200 |
Pierre-Yves David |
histedit: replaces patching logic by merges
|
| Fri, 21 Sep 2012 19:13:25 +0200 |
Pierre-Yves David |
histedit-test: ensure that non commute test will never commute
|
| Fri, 21 Sep 2012 19:24:31 +0200 |
Pierre-Yves David |
histedit: fold in memory
|
| Wed, 25 Jul 2012 11:09:51 +0200 |
Patrick Mezard |
histedit: end folding message with an LF
stable
|
| Mon, 02 Jul 2012 01:47:59 +0200 |
Mads Kiilerich |
tests: make histedit pass on Windows MSYS
|
| Sat, 30 Jun 2012 03:34:50 +0200 |
Mads Kiilerich |
tests: make histedit tests more resilient to filesystem variation
|
| Sat, 30 Jun 2012 03:34:44 +0200 |
Mads Kiilerich |
tests: convert histedit tests to .t
base
tests/test-histedit-fold-non-commute@c61aed8e8304
|
