"Kelvie Wong" <kelvie@xxxxxxxx> 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? - 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
