Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Support for git-mergetool #4
Hi! Thanks for this great tool!
I've tried to configure it as a Git mergetool:
However, Git ignores it and it runs
Do you think there's a particular reason why
@auscompgeek I haven't. Forgot about that! Thanks for the tip!
OK, so this works:
git config --global mergetool.fac.cmd fac git config --global merge.tool fac
A number of environment variables are set by
You can pass any argument you like in the cmd setting, so there's definitely no need for pgrep hacks.
So the configuration in
[mergetool.fac] cmd = fac $BASE $LOCAL $REMOTE
An example from the
"$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED" | cat
I guess you can either specify arguments or command line options for these and include a simple shell file in the repo to run it. This way it would be a 2-line configuration to use