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

[Mads Kiilerich]

Adrian Buehlmann wrote, On 06/15/2012 04:06 PM:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1339765819 -7200
> # Node ID f5d40e50debe54e12e13e8faf83884306169953f
> # Parent  622aa57a90b1d1f09b3204458b087de12ce2de82
> test-merge-tools: inline pointless domerge function
>
> This also uncovers the exit codes of the 'hg merge' calls
>

Pushed to crew, thanks.

/Mads