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

Re: Mergetool generating blank files (1.5.3)

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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help