Tue, 19 Jan 2021 14:00:42 -0800 |
Martin von Zweigbergk |
resolve: also detect new :mergediff conflict markers
|
Thu, 22 Oct 2020 14:14:59 -0700 |
Martin von Zweigbergk |
errors: introduce CanceledError and use it in a few places
|
Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError and use it from commands and cmdutil
|
Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
Thu, 17 Sep 2020 22:34:36 -0700 |
Martin von Zweigbergk |
mergedriver: delete it
|
Mon, 24 Aug 2020 18:59:19 +0530 |
Pulkit Goyal |
debugmergestate: show extras for files which are not in mergestate
|
Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
Thu, 13 Feb 2020 21:14:20 -0800 |
Martin von Zweigbergk |
debugmergestate: make templated
|
Wed, 21 Aug 2019 13:14:39 -0700 |
Martin von Zweigbergk |
merge: hint about using `hg resolve` for resolving conflicts
|
Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
Tue, 29 Jan 2019 12:01:13 -0800 |
Martin von Zweigbergk |
resolve: respect ui.relative-paths
|
Wed, 07 Nov 2018 15:45:09 -0800 |
Kyle Lippincott |
resolve: fix mark-check when a file was deleted on one side (issue6020)
|
Sat, 10 Nov 2018 12:07:26 +0900 |
Yuya Nishihara |
merge with stable
|
Wed, 07 Nov 2018 15:42:56 -0800 |
Kyle Lippincott |
tests: make the commands.resolve.confirm tests not pollute the test-wide hgrc
|
Wed, 07 Nov 2018 15:41:18 -0800 |
Kyle Lippincott |
tests: fix a couple typos in test-resolve.t comments and add a comment
|
Fri, 02 Nov 2018 11:57:45 -0700 |
Kyle Lippincott |
resolve: when resolve.mark-check=abort, downgrade to warning if pats specified
stable
|
Sun, 30 Sep 2018 15:15:27 +0900 |
Yuya Nishihara |
resolve: rename {status} to {mergestatus} to not shadow change status (BC)
|
Sat, 01 Sep 2018 18:00:38 -0400 |
Valentin Gatien-Baron |
resolve: test that we suggest a valid hg command
|
Sun, 26 Aug 2018 16:42:28 -0400 |
Valentin Gatien-Baron |
resolve: add config to make hg resolve not re-merge by default
|
Sun, 26 Aug 2018 15:52:34 -0400 |
Valentin Gatien-Baron |
resolve: add a flag for the default behavior of re-merging
|
Sat, 04 Aug 2018 12:43:41 +0530 |
Sushil khanchi |
resolve: support confirm config option with --unmark flag
|
Sun, 05 Aug 2018 00:53:55 -0700 |
Kyle Lippincott |
resolve: correct behavior of mark-check=none to match docs
|
Sat, 04 Aug 2018 12:23:18 +0530 |
Sushil khanchi |
resolve: support commands.resolve.confirm option with --mark flag
|
Fri, 03 Aug 2018 12:57:44 -0700 |
Kyle Lippincott |
resolve: graduate resolve.mark-check from experimental, add docs
|
Tue, 31 Jul 2018 19:11:17 +0530 |
Sushil khanchi |
resolve: add confirm config option
|
Thu, 26 Jul 2018 17:11:03 -0700 |
Kyle Lippincott |
resolve: add option to warn/abort on -m with unresolved conflict markers
|
Sun, 01 Jul 2018 22:11:23 +0900 |
Yuya Nishihara |
resolve: add support for log-like template keywords and functions
|
Sat, 03 Mar 2018 09:35:59 -0500 |
Augie Fackler |
tests: fix various test-check-module-imports.t violations
|