blob: 6c5101c4f729d49c544436e9262ca75e4ce6cddd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
diff_cmd () {
"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
--default --mode=merge3 --to="$MERGED"
else
"$merge_tool_path" "$LOCAL" "$REMOTE" \
--default --mode=merge2 --to="$MERGED"
fi
}
|
