diff options
| author |  David Aguilar <davvid@gmail.com> | 2009-04-11 20:41:56 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-12 15:19:12 -0700 |
| commit | 47d65924a69576bd9f3254f7055de6b37a359596 (patch) | |
| tree | 8476f9097193153c708498c78cc7e9bc3db6946e /userdiff.h | |
| parent | Fix misspelled mergetool.keepBackup (diff) | |
| download | tgif-47d65924a69576bd9f3254f7055de6b37a359596.tar.xz | |
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>
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions