| commit | 47d65924a69576bd9f3254f7055de6b37a359596 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sun, 12 Apr 2009 03:41:56 +0000 (11 20:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 Apr 2009 22:19:12 +0000 (12 15:19 -0700) | ||
| tree | 8476f9097193153c708498c78cc7e9bc3db6946e | treesnapshot (tar.gz zip) |
| parent | 70af4e9bef988a98061237c78cbd0a71d8de48bb | commitdiff |
mergetool--lib: simplify API usage by removing more global variables
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>
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>
| Documentation/git-mergetool--lib.txt | diffblobblamehistory | |
| git-difftool--helper.sh | diffblobblamehistory | |
| git-mergetool--lib.sh | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |