I'm trying to setup a merge driver in my ubuntu, but everytime I call "git
merge-file left.java base.java right.java" nothing happens.
my $HOME/.gitconfig file
[core]
attributesfile = ~/.gitattributes
[merge "s3m"]
name = custom semistructured merge driver for java files
driver = java -jar jFSTMerge.jar -f %A %O %B -o /home/crowdoctor/output.
txt
my $HOME/.gitattributes file
*.java merge=s3m
When I run my custom merge driver jar alone it works, someone got a clue
about what is happening?
All the files are in the correct path, also the jar is in $HOME
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
