log tests/test-merge1.t @ 51448:89cd0dd41e4d stable

age author description
Sun, 20 Feb 2022 15:28:44 -0700 Gregory Szorc tests: remove from __future__ from inline Python in tests
Fri, 19 Nov 2021 03:04:42 +0100 Pierre-Yves David dirstate: remove need_delay logic
Fri, 29 Jan 2021 15:56:08 -0800 Martin von Zweigbergk errors: use StateError more in merge module
Mon, 23 Nov 2020 23:08:58 -0800 Martin von Zweigbergk errors: raise StateError on uncommitted changes when merge starts
Fri, 20 Nov 2020 14:43:21 -0800 Martin von Zweigbergk errors: raise ConfigError on failure to parse config file
Thu, 22 Oct 2020 13:56:01 -0700 Martin von Zweigbergk errors: set detailed exit code to 30 for config errors
Mon, 12 Oct 2020 12:44:18 -0700 Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil
Thu, 08 Oct 2020 15:35:44 -0700 Martin von Zweigbergk errors: stop passing non-strings to Abort's constructor
Thu, 03 Oct 2019 13:18:15 -0700 Martin von Zweigbergk unfinishedstate: suggested `hg update .` (including `.`) to complete update
Sun, 09 Jun 2019 02:12:58 +0530 Taapas Agrawal statecheck: added support for STATES
Sun, 09 Dec 2018 21:23:34 -0500 Matt Harbison py3: quote several instances of $PYTHON for Windows
Wed, 12 Sep 2018 23:10:59 -0400 Matt Harbison tests: stabilize change for handling not quoting non-empty-directory
Wed, 12 Sep 2018 11:38:46 -0400 Augie Fackler tests: handle Python 3 not quoting non-empty-directory error
Fri, 07 Sep 2018 23:39:49 -0400 Matt Harbison tests: conditionalize an error message about unlinking a non empty directory
Sun, 19 Aug 2018 13:27:02 +0900 Yuya Nishihara merge: do not delete untracked files silently (issue5962) stable