log tests/test-conflict.t @ 44115:e1b8b4e4f496

age author description
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
Wed, 07 Feb 2018 13:49:02 +0530 Pulkit Goyal py3: make sure we open the file in bytes mode
Wed, 07 Feb 2018 13:34:51 +0530 Pulkit Goyal py3: add b'' prefixes to string literals in test files
Mon, 08 Jan 2018 19:41:47 +0530 Pulkit Goyal merge: add `--abort` flag which can abort the merge
Thu, 03 Aug 2017 05:12:35 +0530 Pulkit Goyal morestatus: move fb extension to core by plugging to `hg status --verbose`
Wed, 05 Jul 2017 11:10:11 -0500 Augie Fackler tests: replace yet more calls to `python` with $PYTHON
Tue, 06 Jun 2017 22:17:39 +0530 Pulkit Goyal update: show the commit to which we updated in case of multiple heads (BC)
Sat, 25 Feb 2017 19:36:02 +0900 Yuya Nishihara filemerge: optionally strip quotes from merge marker template (BC)
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers