log tests/test-narrow-merge.t @ 51936:c6899b334d56 default tip

age author description
Mon, 26 Jun 2023 14:34:58 +0200 Mads Kiilerich tests: use grep -E instead of obsolescent egrep stable
Thu, 03 Feb 2022 18:14:11 +0100 Pierre-Yves David narrow: allow merging non-conflicting change outside of the narrow spec
Fri, 19 Nov 2021 15:39:35 -0800 Martin von Zweigbergk errors: use detailed exit code when trying to merge file outside narrowspec