... This prevented custom >> mergetools from being able to use them. >> >> We now export them so ... custom merge tool patch to > git mergetool was to support custom mergetools without the need for a > wrapper script, just a git config variable. > > I know ...

git - Evgeny - May 17 2008 - 19:55

... custom > mergetools from being able to use them. > > We now export ... tool patch to git mergetool was to support custom mergetools without ... need for a wrapper script, just a git config variable. I ... able to get p4 merge to work by setting the config ...

git - Charles Bailey - May 17 2008 - 19:34

The MERGED, BACKUP, LOCAL, REMOTE and BASE variables were not being exported ... prevented custom mergetools from being able to use them. We now export them so that arbitrary ... Signed-off-by: David Aguilar ...

git - David Aguilar - May 17 2008 - 16:39

... things is not my strongest ability. > > [mergetool "p4merge"] > cmd = p4merge.sh "$PWD/$BASE ... a few examples in the original patch mail text (note that 'path' ... discussion about eval vs. leaking environment variables: http://thread.gmane.org/gmane. ...

git - Charles Bailey - May 17 2008 - 20:07

... to) an invalid file. Use 'launchp4merge -h' for more help. I ... is not my strongest ability. > >> >> [mergetool "p4merge"] >> cmd = p4merge.sh "$PWD/$ ... about eval vs. leaking > environment variables: > > http://thread.gmane.org/gmane. ...

git - Evgeny - May 17 2008 - 20:12