Revision fd3aeeab0d41474af86e41d207196abbb7bf78f6 authored by Brian Bourn on 19 March 2014, 15:58:22 UTC, committed by Junio C Hamano on 19 March 2014, 18:49:39 UTC
Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Brian Bourn <ba.bourn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9daf0ef
tkdiff
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
else
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
fi
}
Computing file changes ...