On Sat, Feb 19, 2011 at 11:21, Jeff King <peff@xxxxxxxx> wrote: > Let's bump the diff/merge default limits from 200/500 to > 400/1000. Those are 2 seconds and 10 seconds respectively on > my modern hardware. This is somewhat outside the scope of your patch, but rather than making these decisions for the user and compiling them into Git wouldn't it be better to expose it somehow? E.g. when you do a git-merge show a progress bar (similar to git-clone) showing that we're trying to do rename detection, show that we stopped, and when we fail point out that the user could run git-merge with some switch that would make Git try harder. -- 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