Ohh, so the documentation is not clear then. Now that you say it this way, I finally understant that I should have in my ~/.gitconfig something like: [mergetool "p4merge"] cmd = p4merge.sh "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED" keepBackup = false [merge] tool = p4merge Thanks for the explanation! I believe that an example in the documentation could be a nice addition, to clear things up in the future. PS: The latest version of P4Merge did not work without the $PWD/ (fullpath). strange, but an older version worked okay even without it. No patch is needed -- all is great, thank you great people! :) Thank you Charles! - Evgeny On Sun, May 18, 2008 at 2:34 AM, Charles Bailey <charles@xxxxxxxxxxxxx> wrote: > On Sat, May 17, 2008 at 01:39:26PM -0700, David Aguilar wrote: >> The MERGED, BACKUP, LOCAL, REMOTE and BASE variables were not being >> exported from the git-mergetool.sh script. This prevented custom >> mergetools from being able to use them. >> >> We now export them so that arbitrary mergetools can easily interact >> with git mergetool. >> >> This problem was Reported-By: Evgeny <evgeny.zislis@xxxxxxxxx> >> >> Signed-off-by: David Aguilar <davvid@xxxxxxxxx> > > I think there must be a misunderstanding here. The variables are not > designed to be exported. The point of the 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 that (with the right config) git mergetool supports p4merge as > it is one of a selection of tools that I tested it with. You should be > able to get p4 merge to work by setting the config variable: > > mergetool.p4merge.cmd > > to the value (IIRC, and I don't have the p4merge documentation to hand): > > p4merge "$BASE" "$REMOTE" "$LOCAL" "$MERGED" > > Getting the quoting correct on this depends on whether you set it via > commandline or via editing a git config file and can be a little > tricky. > > If you have a wrapper shell script then you can easily pass these as > positional parameters and re-export them as necessary. > > -- > Charles Bailey > http://ccgi.hashpling.plus.com/blog/ > -- 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
