e2161bc385
The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto- solvable." This flag was carried over from the original mergetool commands. diff_cmd() is for two-way comparisons only so remove the superfluous flag. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
25 lines
499 B
Plaintext
25 lines
499 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" \
|
|
--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=$?
|
|
}
|