git/git-mergetool--lib.sh, branch v1.6.3Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v1.6.32009-04-12T22:19:12Zmergetool--lib: simplify API usage by removing more global variables2009-04-12T22:19:12ZDavid Aguilardavvid@gmail.com2009-04-12T03:41:56Zurn:sha1:47d65924a69576bd9f3254f7055de6b37a359596
The mergetool--lib scriplet was tricky to use because it relied upon
the existance of several global shell variables. This removes more
global variables so that things are simpler for callers.
A side effect is that some variables are recomputed each time
run_merge_tool() is called, but the overhead for recomputing
them is justified by the simpler implementation.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
difftool/mergetool: refactor commands to use git-mergetool--lib2009-04-08T07:25:24ZDavid Aguilardavvid@gmail.com2009-04-08T07:17:20Zurn:sha1:21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105
This consolidates the common functionality from git-mergetool and
git-difftool--helper into a single git-mergetool--lib scriptlet.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>