From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 22:41:57 +0000 (-0800)
Subject: Merge branch 'jk/mergetool'
X-Git-Tag: v1.8.2-rc0~40
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=55f56fee0765820d5c841e47b22f33f5a7253e16;p=git-core%2Fgit.git

Merge branch 'jk/mergetool'

Cleans up mergetool/difftool combo.

* jk/mergetool:
  mergetools: simplify how we handle "vim" and "defaults"
  mergetool--lib: don't call "exit" in setup_tool
  mergetool--lib: improve show_tool_help() output
  mergetools/vim: remove redundant diff command
  git-difftool: use git-mergetool--lib for "--tool-help"
  git-mergetool: don't hardcode 'mergetool' in show_tool_help
  git-mergetool: remove redundant assignment
  git-mergetool: move show_tool_help to mergetool--lib
---

55f56fee0765820d5c841e47b22f33f5a7253e16