| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
| Tue, 18 Jan 2022 15:04:55 -0800 |
Martin von Zweigbergk |
merge: set custom conflict label for base commit
|
| Fri, 14 Jan 2022 09:28:44 -0800 |
Martin von Zweigbergk |
merge: consider the file merged when using :merge-{local,other}
|
| Sat, 18 Dec 2021 11:47:03 +0100 |
Simon Sapin |
rhg: Fall back to Python if verbose status is requested by config
|
| Tue, 09 Nov 2021 19:55:46 +0100 |
Simon Sapin |
rhg: Enable `rhg status` in most tests
|
| Tue, 08 Dec 2020 16:45:13 -0800 |
Martin von Zweigbergk |
mergetools: add new conflict marker format with diffs in
|
| Tue, 08 Dec 2020 13:33:40 -0800 |
Martin von Zweigbergk |
status: disable morestatus when using -0
|
| Fri, 23 Oct 2020 15:59:32 -0700 |
Martin von Zweigbergk |
config: rename ui.mergemarkertemplate to command-templates.mergemarker
|
| Mon, 09 Dec 2019 22:24:58 -0800 |
Rodrigo Damazio Bovendorp |
status: outputting structured unfinished-operation information
|
| Mon, 09 Dec 2019 22:06:55 -0800 |
Rodrigo Damazio Bovendorp |
status: add template/json data about whether a file has unresolved conflicts
|
| Sat, 15 Sep 2018 21:35:36 +0900 |
Yuya Nishihara |
status: remove "morestatus" message from formatter data (BC)
|
| Sat, 15 Sep 2018 21:28:47 +0900 |
Yuya Nishihara |
tests: show that the structure of the more status output looks weird
|
| Tue, 18 Sep 2018 23:47:21 -0400 |
Matt Harbison |
tests: quote PYTHON usage
|
| Thu, 09 Aug 2018 12:32:11 +0300 |
Pulkit Goyal |
status: advertise --abort instead of 'update -C .' to abort a merge
|
| Wed, 13 Jun 2018 22:50:32 +0530 |
Pulkit Goyal |
morestatus: remove some extra spaces
|
