[PATCH 0/3] mergetool/difftool cleanup

This is a cleanup series to remove the use of the $status global variable in mergetool/difftool.

This should wait until after the current RC series is over but figured I'd send it out.

David Aguilar (3):
  mergetool--lib: remove use of $status global
  difftool--helper: add explicit exit statement
  mergetool: simplify conditionals

 git-difftool--helper.sh |  2 ++
 git-mergetool--lib.sh   | 20 +++++---------------
 git-mergetool.sh        | 16 +++++-----------
 3 files changed, 12 insertions(+), 26 deletions(-)