• Junio C Hamano's avatar
    apply: accept -3/--3way command line option · cfb6f9ac
    Junio C Hamano authored
    Begin 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, other than
    making sure that "--reject" and "--3way" are not given together, and
    making "--3way" imply "--index".
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
t4117-apply-reject.sh 2.77 KB