From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Dec 2014 22:31:39 +0000 (-0800)
Subject: Merge branch 'da/difftool-mergetool-simplify-reporting-status'
X-Git-Tag: v2.3.0-rc0~83
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8?hp=--cc

Merge branch 'da/difftool-mergetool-simplify-reporting-status'

Code simplification.

* da/difftool-mergetool-simplify-reporting-status:
mergetools: stop setting $status in merge_cmd()
mergetool: simplify conditionals
difftool--helper: add explicit exit statement
mergetool--lib: remove use of $status global
mergetool--lib: remove no-op assignment to $status from setup_user_tool
---

0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8