diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-08 02:41:57 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-08 02:41:57 +0400 |
| commit | 55f56fee0765820d5c841e47b22f33f5a7253e16 (patch) | |
| tree | 77f46ce5ac859508725ae00d0f60b95b7799b671 /mergetools/emerge | |
| parent | b9a5f6811d186ec2420df39e3ec8087c7166a636 (diff) | |
| parent | 073678b8e6324a155fa99f40eee0637941a70a34 (diff) | |
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
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions