I was in fact using mergetool.p4merge.cmd ... and the documentation explains regarding the non-working environment variables. Hopefully with the new patch it will work okay. Thanks David! -- Evgeny On Sat, May 17, 2008 at 11:47 PM, David Aguilar <davvid@xxxxxxxxx> wrote: > On Sat, May 17, 2008 at 1:21 PM, Jakub Narebski <jnareb@xxxxxxxxx> wrote: >> Evgeny <evgeny.zislis@xxxxxxxxx> writes: >> >>> Background: >>> I am trying to use a custom mergetool with git. >>> The documentation explains that environment variables >>> $BASE, $LOCAL, $REMOTE, $MERGED >>> are set for the invocation of the mergetool command. >>> >>> Problem: >>> I wrote a wrapper for P4Merge, and I check for these environment >>> variables - but they are not there. After a closer inspection >>> of git-mergetool I see that infact these variables are not being >>> sent to the external command at all, and are just in the context >>> of the git-mergetool script. >> >> From what I know of git-mergetool, you can use one of the predefined >> merge tools: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, >> ecmerge, and opendiff (optionally providing path to the tool) >> >> To add support for P4Merge you would have either modify >> git-mergetool.sh (and, optionally, send a patch to git mailing list), >> or make use of `mergetool.<tool>.cmd` configuration option. >> Unfortunately there is no example... >> >> -- >> Jakub Narebski >> Poland >> ShadeHawk on #git > > I just sent a patch that exports these variables. > > Presumably we do not want to modify git-mergetool.sh every single time > someone needs to be able to use a new mergetool, hence the patch I > sent makes sense to me. Let me know if you think otherwise. > Thanks, > -- > David > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
