On Thu, Sep 27, 2007 at 02:41:23PM -0700, Junio C Hamano wrote: > When mergetool is run from a subdirectory, "ls-files -u" nicely > limits the output to conflicted files in that directory, but > we need to give the full path to cat-file plumbing to grab the > contents of stages. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> Acked-by: "Theodore Ts'o" <tytso@xxxxxxx> - Ted - 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
