Skip to content
This repository
tree: b2f4b6cec2
Fetching contributors…

Cannot retrieve contributors at this time

file 16 lines (15 sloc) 0.34 kb
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
diff_cmd () {
"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

merge_cmd () {
touch "$BACKUP"
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
check_unchanged
}
Something went wrong with that request. Please try again.