Mercurial > hg

log tests/test-conflict.t @ 51708:3131445a831b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 18 Nov 2022 13:47:29 +0000 Arseniy Alekseyev tests: run many tests in $TESTTMP/repo instead of $TESTTMP stable
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
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
Fri, 07 Oct 2016 08:51:50 -0700 Simon Farnsworth merge: add conflict labels to merge command
Wed, 10 Feb 2016 09:06:08 -0800 Ryan McElroy merge: minimize conflicts when common base is not shown (issue4447)
Tue, 02 Feb 2016 14:49:02 +0000 Pierre-Yves David update: warn about other topological heads on bare update
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Thu, 10 Sep 2015 09:41:11 -0400 Jordi Gutiérrez Hermoso filemerge: add non-interactive :merge-local and :merge-other
Tue, 05 Aug 2014 14:58:45 -0700 Pierre-Yves David merge: add an internal:merge3 tool
Fri, 18 Jul 2014 21:49:52 -0500 Matt Mackall filemerge: use non-minimal conflict marker regions (BC)
Mon, 09 Jun 2014 03:49:07 -0700 Pierre-Yves David test: use more elaborated content in ``test-conflict.t``
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use only the first line of the generated conflict marker for safety
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Thu, 08 May 2014 16:50:22 -0700 Durham Goode merge: add conflict marker formatter (BC)
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sun, 12 Sep 2010 18:05:53 -0500 Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Thu, 12 Aug 2010 20:02:59 +0900 Nicolas Dumazet tests: unify test-conflict base tests/test-conflict@d6cf657d98b8
less more | (0) tip