David Aguilar <davvid@xxxxxxxxx> writes:
>>> +merge_cmd () {
>>> + if $base_present
>>> + then
>>> + "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$PWD/$MERGED"
>>> + else
>>> + "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$PWD/$MERGED"
>>> + fi >/dev/null 2>&1
>>> +}
>
> Is the $PWD/ prefix strictly needed? The rest of the mergetools use
> $MERGED as-is. Does it work without it?
Hrm, I didn't notice it but they do look fishy. Thanks for good eyes.
Tim?
--
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