diff options
| author |  David Aguilar <davvid@gmail.com> | 2014-11-21 01:03:10 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-11-21 11:27:53 -0800 |
| commit | 1e86d5b11dcf31adf11363caa1e96a94612b16f4 (patch) | |
| tree | 87b8ace37e6972a15fc054987b4fbac3e420a918 /mergetools/kdiff3 | |
| parent | mergetool: simplify conditionals (diff) | |
| download | tgif-1e86d5b11dcf31adf11363caa1e96a94612b16f4.tar.xz | |
mergetools: stop setting $status in merge_cmd()
No callers rely on $status so there's don't need to set
it during merge_cmd() for diffmerge, emerge, and kdiff3.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/kdiff3')
| -rw-r--r-- | mergetools/kdiff3 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index a30034f116..793d1293b1 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -20,5 +20,4 @@ merge_cmd () { -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi - status=$? } |