Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

Re: [PATCH v2] mergetools: add support for DeltaWalker

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:12

David Aguilar [off-list ref] writes:
quoted
quoted
+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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help