Skip to content

Commit

Permalink
Merge branch 'th/mergetools-deltawalker'
Browse files Browse the repository at this point in the history
By Tim Henigan
* th/mergetools-deltawalker:
  mergetools: add a plug-in to support DeltaWalker
  • Loading branch information
Junio C Hamano committed Mar 6, 2012
2 parents 4b4ec3f + 284a126 commit f4464a3
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions mergetools/deltawalker
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit f4464a3

Please sign in to comment.