Ciaran <ciaranj@xxxxxxxxx> writes:
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index fb3f52b..4db9212 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -258,12 +258,9 @@ run_merge_tool () {
> ;;
> p4merge)
> if merge_mode; then
> - touch "$BACKUP"
> - if $base_present; then
> - "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
> - else
> - "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
> - fi
> + touch "$BACKUP"
> + $base_present || >"$BASE"
> + "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
> check_unchanged
Will queue this version as-is; thanks.
Somebody might want to revisit if that "touch" is still really necessary,
though. It is outside the scope of this change, as that has been there
before this patch.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html