user/sven/git.git/git-mergetool--lib.sh, branch v1.6.4.5

mergetool--lib: add support for araxis merge

2009-05-24T18:21:05Z

Araxis merge is now a built-in diff/merge tool. This adds araxis to git-completion and updates the documentation to mention araxis. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool--lib: specialize diff options for emerge and ecmerge

2009-05-09T15:25:22Z

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 Signed-off-by: Junio C Hamano

mergetool--lib: simplify API usage by removing more global variables

2009-04-12T22:19:12Z

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 Signed-off-by: Junio C Hamano

difftool/mergetool: refactor commands to use git-mergetool--lib

2009-04-08T07:25:24Z

This consolidates the common functionality from git-mergetool and git-difftool--helper into a single git-mergetool--lib scriptlet. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano