2011-08-18 09:23:46 +02:00
|
|
|
diff_cmd () {
|
2013-05-09 11:13:28 +02:00
|
|
|
"$merge_tool_path" \
|
2011-08-18 09:23:46 +02:00
|
|
|
--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
|
|
|
|
|
"$LOCAL" "$REMOTE" >/dev/null 2>&1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
merge_cmd () {
|
|
|
|
|
if $base_present
|
|
|
|
|
then
|
|
|
|
|
"$merge_tool_path" --auto \
|
|
|
|
|
--L1 "$MERGED (Base)" \
|
|
|
|
|
--L2 "$MERGED (Local)" \
|
|
|
|
|
--L3 "$MERGED (Remote)" \
|
|
|
|
|
-o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
|
|
|
|
|
>/dev/null 2>&1
|
|
|
|
|
else
|
|
|
|
|
"$merge_tool_path" --auto \
|
|
|
|
|
--L1 "$MERGED (Local)" \
|
|
|
|
|
--L2 "$MERGED (Remote)" \
|
|
|
|
|
-o "$MERGED" "$LOCAL" "$REMOTE" \
|
|
|
|
|
>/dev/null 2>&1
|
|
|
|
|
fi
|
|
|
|
|
status=$?
|
|
|
|
|
}
|
