log tests/test-merge-remove.t @ 52002:22a50b7934d2 default 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
Wed, 15 Sep 2021 11:13:46 +0200 Pierre-Yves David dirstate: fix restoration of "merged" state after a remove
Fri, 29 Jan 2021 15:56:08 -0800 Martin von Zweigbergk errors: use StateError more in merge module
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Thu, 20 Sep 2018 21:35:01 -0700 Martin von Zweigbergk debugdirstate: deprecate --nodates in favor of --no-dates
Fri, 31 Aug 2018 23:28:09 +0530 Sushil khanchi revert: fix the inconsistency of status msgs in --interactive mode