tests/test-merge-force.t
Tue, 18 Jan 2022 15:04:55 -0800 Martin von Zweigbergk merge: set custom conflict label for base commit
Thu, 20 Jan 2022 14:13:12 -0800 Martin von Zweigbergk filemerge: always define a "base" label
Thu, 02 Dec 2021 22:59:36 -0800 Martin von Zweigbergk mergestate: merge `preresolve()` into `resolve()`
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)
less more (0) -15 tip