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

login
register
mail settings
Submitter Völker Ronny
Date April 16, 2013, 12:31 p.m.
Message ID <679C86927552B447B2A1522BFC65B7E33BB6233E@srv-cob-vm-0059.elaxy.org>
Download mbox | patch
Permalink /patch/1345/
State Superseded, archived
Commit 9bfa86746c9c1f6ab51deb8f174ffc482417d09f
Headers show

Comments

Völker Ronny - April 16, 2013, 12:31 p.m.
# HG changeset patch
# User ronvoe12249 <ronny.voelker@elaxy.com>
# Date 1366113338 -7200
# Node ID 3f4c3f0fa21d9fca517425b8415a28963105f210
# Parent  5fb773727e953740e66f5b2c69739db7136549d8
mergetools.hgrc meld.args: rename 'base' to 'merged'

This makes it clear, which panel is the target of the merge operation.
Matt Mackall - April 16, 2013, 3:21 p.m.
On Tue, 2013-04-16 at 12:31 +0000, Völker Ronny wrote:
> # HG changeset patch
> # User ronvoe12249 <ronny.voelker@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.

Patch

diff -r 5fb773727e95 -r 3f4c3f0fa21d contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Thu Feb 21 14:49:25 2013 +0100
+++ b/contrib/mergetools.hgrc	Tue Apr 16 13:55:38 2013 +0200
@@ -25,7 +25,7 @@ 
 gpyfm.gui=True
 
 meld.gui=True
-meld.args=--label='local' $local --label='base' $base --label='other' $other -o $output
+meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output
 meld.check=changed
 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child