| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
| Tue, 18 Sep 2018 23:47:21 -0400 |
Matt Harbison |
tests: quote PYTHON usage
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
| Tue, 20 Jun 2017 09:45:02 -0400 |
Augie Fackler |
cleanup: use $PYTHON to run python in many more tests
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
| 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
|
| Wed, 03 Feb 2016 13:11:34 -0800 |
Siddharth Agarwal |
test-merge-force: add tests for merge.checkunknown=warn
|
| Wed, 23 Dec 2015 12:51:45 -0800 |
Siddharth Agarwal |
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
|
| Sun, 27 Dec 2015 15:24:48 -0800 |
Danek Duvall |
tests: Solaris diff -U also emits "No differences encountered"
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
| Tue, 24 Nov 2015 15:03:00 -0800 |
Siddharth Agarwal |
test-merge-force.t: check .orig files separately
|
| 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
|
| Thu, 17 Apr 2014 22:47:38 +0200 |
Mads Kiilerich |
spelling: fixes from proofreading of spell checker issues
|
| Wed, 26 Nov 2014 11:45:21 -0800 |
Martin von Zweigbergk |
merge: add more thorough tests for --force
|
| Mon, 23 Sep 2013 20:50:51 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty working dir
|
| Wed, 07 Dec 2011 11:23:01 -0600 |
Kevin Bullock |
merge: make 'nothing to merge' aborts consistent
|
| Thu, 16 Sep 2010 17:51:32 -0500 |
Matt Mackall |
tests: add exit codes to unified tests
|
| Sat, 11 Sep 2010 17:58:37 +0200 |
Adrian Buehlmann |
tests: unify test-merge-force
base
tests/test-merge-force@cfa3c35fec91
|
