3 commits

Author	SHA1	Message	Date
David Aguilar	4481ff048d	mergetool--lib: specialize diff options for emerge and ecmerge ... The ecmerge documentation mentions the following form: ecmerge --mode=diff2 $1 $2 Since git-difftool is about diffing, we should use that instead of --mode=merge2. Likewise, this drops the $MERGED argument to emerge, as discussed on the git list ($gmane/117930). Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2009-05-09 08:25:22 -07:00
David Aguilar	47d65924a6	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>	2009-04-12 15:19:12 -07:00
David Aguilar	21d0ba7ebb	difftool/mergetool: refactor commands to use git-mergetool--lib ... 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>	2009-04-08 00:25:24 -07:00