[PATCH] test-merge-tools: inline pointless domerge function

[Adrian Buehlmann]

On 2012-06-15 15:58, Adrian Buehlmann wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1339765819 -7200
> # Node ID 2c4edd8a53100f25067981f9a6f8df50ce716c3a
> # Parent  622aa57a90b1d1f09b3204458b087de12ce2de82
> test-merge-tools: inline pointless domerge function
> 
> This also uncovers the exit codes of the 'hg merge' calls
> 
> diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
> --- a/tests/test-merge-tools.t
> +++ b/tests/test-merge-tools.t
> @@ -1,5 +1,3 @@
> -  $ "$TESTDIR/hghave" system-sh || exit 80
> -

This slipped through and is premature. Please disregard. Will resend
without that in a minute.