On Tue, Oct 21, 2008 at 11:13:19AM +0100, Charles Bailey wrote: > This option stops git mergetool from aborting at the first failed merge. > This allows some additional use patterns. Merge conflicts can now be > previewed one at time and merges can also be skipped so that they can be > performed in a later pass. All 3 patches look good to me, and match what I expected from our earlier discussion. But I am not too familiar with mergetool, so take my approval with a grain of salt. :) -Peff -- 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
