On Thu, May 10, 2012 at 1:02 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > This is the beginning of teaching the three-way merge fallback logic "git > am -3" uses to the underlying "git apply". It only implements the command > line parsing part, and does not do anything interesting yet. Can we reuse '-3/--3way' instead of --threeway? I already have hard time remembering which command uses -m/--merge, which one -3. -- Duy -- 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