kernel/git - git - PowerEL Git System

45879 Commits

6 Branches

36 Tags

131 MiB

Tree: d6b1230067

Commit Graph

Author	SHA1	Message	Date
David Aguilar	073678b8e6	mergetools: simplify how we handle "vim" and "defaults" Remove the exceptions for "vim" and "defaults" in the mergetool library so that every filename in mergetools/ matches 1:1 with the name of a valid built-in tool. Define the trivial fallback definition of shell functions in-line in git-mergetool-lib script, instead of dot-sourcing them from another file. The result is much easier to follow. [jc: squashed in an update from John Keeping as well] Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	12 years ago

Author

SHA1

Message

Date

David Aguilar

073678b8e6

mergetools: simplify how we handle "vim" and "defaults"

Remove the exceptions for "vim" and "defaults" in the mergetool library
so that every filename in mergetools/ matches 1:1 with the name of a
valid built-in tool.

Define the trivial fallback definition of shell functions in-line in
git-mergetool-lib script, instead of dot-sourcing them from another
file.  The result is much easier to follow.

[jc: squashed in an update from John Keeping as well]

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

12 years ago

1 Commits (d6b12300676c85175bb05088c79e4b975aed820c)