git/git-mergetool--lib.sh, branch v1.7.2

add shebang line to git-mergetool--lib.sh

2010-01-29T17:56:51Z

Even though this script is expected to be sourced instead of executed on its own, the #!/bin/sh line provides simple documentation about what format the file is in. In particular, the lack of such a line was confusing the valgrind support of our test scripts, which assumed that any executable without a #!-line should be intercepted and run through valgrind. So during valgrind-enabled tests, any script sourcing this file actually sourced the valgrind interception script instead. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rs/work-around-grep-opt-insanity'

2009-11-25T19:45:07Z

* rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() Conflicts: git-instaweb.sh

mergetool--lib: simplify guess_merge_tool()

2009-11-23T23:38:04Z

Use a case statement instead of calling grep to find out if the editor's name contains the string "vim". Remove the check for emacs, as this branch did the same as the default one anyway. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

mergetool--lib: add p4merge as a pre-configured mergetool option

2009-10-28T23:48:20Z

Add p4merge to the set of built-in diff/merge tools, and update bash completion and documentation. Signed-off-by: Scott Chacon Signed-off-by: Junio C Hamano

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