On Mon, Mar 30, 2009 at 1:11 AM, David Aguilar <davvid@xxxxxxxxx> wrote: > This function launches merge tools and will be used to refactor > git-(diff|merge)tool. Thanks for writing difftool; I find it quite useful. I tried it with tkdiff, and noticed that it shows the 'merge preview' window even though it isn't doing a merge. If a user with unstaged changes were to carelessly click the 'save and exit' button, his changes could be lost. So I think it's a good idea to stop the merge preview window from showing up under difftool. To do that I think you just have to remove the '-o "$MERGED"' option to tkdiff. James -- 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
