Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
[git] / mergetools / diffuse
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3 }
4
5 merge_cmd () {
6         touch "$BACKUP"
7         if $base_present
8         then
9                 "$merge_tool_path" \
10                         "$LOCAL" "$MERGED" "$REMOTE" \
11                         "$BASE" | cat
12         else
13                 "$merge_tool_path" \
14                         "$LOCAL" "$MERGED" "$REMOTE" | cat
15         fi
16         check_unchanged
17 }