[PATCH] Fix meld.args in mergetools.rc: add -o $output (2/3)

[Matt Mackall]

On Tue, 2013-04-16 at 12:31 +0000, Völker Ronny wrote:
> # HG changeset patch
> # User ronvoe12249 <ronny.voelker at elaxy.com>
> # Date 1366113338 -7200
> # Node ID 3f4c3f0fa21d9fca517425b8415a28963105f210
> # Parent  5fb773727e953740e66f5b2c69739db7136549d8
> mergetools.hgrc meld.args: rename 'base' to 'merged'

These two are queued for default with some tweaks to their descriptions,
thanks.

-- 
Mathematics is the supreme nostalgia of our time.