Merge branch 'th/mergetools-deltawalker'
By Tim Henigan * th/mergetools-deltawalker: mergetools: add a plug-in to support DeltaWalker
This commit is contained in:
commit
f4464a3b7c
21
mergetools/deltawalker
Normal file
21
mergetools/deltawalker
Normal file
@ -0,0 +1,21 @@
|
||||
diff_cmd () {
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
merge_cmd () {
|
||||
# Adding $(pwd)/ in front of $MERGED should not be necessary.
|
||||
# However without it, DeltaWalker (at least v1.9.8 on Windows)
|
||||
# crashes with a JRE exception. The DeltaWalker user manual,
|
||||
# shows $(pwd)/ whenever the '-merged' options is given.
|
||||
# Adding it here seems to work around the problem.
|
||||
if $base_present
|
||||
then
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
|
||||
else
|
||||
"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
|
||||
fi >/dev/null 2>&1
|
||||
}
|
||||
|
||||
translate_merge_tool_path() {
|
||||
echo DeltaWalker
|
||||
}
|
Loading…
Reference in New Issue
Block a user