On Sun, May 18, 2008 at 02:55:10AM +0300, Evgeny wrote: > Ohh, so the documentation is not clear then. That's a pity, I did make an effort with the documentation, but explaining things is not my strongest ability. > > [mergetool "p4merge"] > cmd = p4merge.sh "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED" > keepBackup = false > > [merge] > tool = p4merge > "$PWD/" looks very wrong. Perhaps p4merge.sh is changing its working directory and not handling the passed paths correctly? > Thanks for the explanation! > I believe that an example in the documentation could be a nice > addition, to clear things up in the future. Yes, there were a few examples in the original patch mail text (note that 'path' has sinces changed to 'MERGED'), but they never made it to the documentation. There's also some discussion about eval vs. leaking environment variables: http://thread.gmane.org/gmane.comp.version-control.git/74059 -- 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
