3 ms·
It looks like this may be a premature announcement because the installation instructions don't work, specifically the debian notes. If someone is listening, I
by davvid 11y ago
It looks like this may be a premature announcement because the installation instructions don't work, specifically the debian notes.
If someone is listening, I would suggest adding a SYNOPSIS section to the documentation with the command-line usage. e.g., does it support 3-way base/local/remote diffs?
`git difftool` knows about a lot of these kinda tools.. if this one looks promising (it's free, so that's already a plus) then we can teach difftool about it. I guess I'll wait and see if it materializes.
Adding support to git is pretty simple: create `mergetools/diffoscope` with this (I'm guessing the cli syntax, but you get the idea):
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" --output "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
else
"$merge_tool_path" --output "$MERGED" "$LOCAL" "$REMOTE"
fi
}
In an existing git installation, that scriptlet can be copied to `$(git --exec-path)/mergetools/diffoscope`. It can then be used as `git difftool -t diffoscope`.