From: David Aguilar <davvid@gmail.com>
Date: Mon, 28 Jan 2013 00:52:23 +0000 (-0800)
Subject: mergetool--lib: simplify command expressions
X-Git-Tag: v1.8.2-rc0~38^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/80ff2b68f28193af70d4c0bb9d363531eb1c3d23?ds=inline;hp=80ff2b68f28193af70d4c0bb9d363531eb1c3d23

mergetool--lib: simplify command expressions

Update variable assignments to always use $(command "$arg")
in their RHS instead of "$(command "$arg")" as the latter
is harder to read.  Make get_merge_tool_cmd() simpler by
avoiding "echo" and $(command) substitutions completely.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---