2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:37
"Kelvie Wong" [off-list ref] writes:
And then meld starts up, with the original file in the middle, and two blank files on the side, LOCAL and REMOTE respectively.
Wild guess. Are you running this from a subdirectory? I have a mild suspicion that mergetool is not subdirectory safe. Can you try running it from the toplevel of the work tree?
From: Kelvie Wong <hidden>
Date: 2016-06-15 22:43:37
Egads, it's alive! I was in a subdirectory (most of my work is in that one subdirectory anyways :p), but running it on the top level did indeed work as expected. Thanks, Kelvie On 9/27/07, Junio C Hamano [off-list ref] wrote:
"Kelvie Wong" [off-list ref] writes:quoted
And then meld starts up, with the original file in the middle, and two blank files on the side, LOCAL and REMOTE respectively.Wild guess. Are you running this from a subdirectory? I have a mild suspicion that mergetool is not subdirectory safe. Can you try running it from the toplevel of the work tree?
-- Kelvie