apply: accept -3/--3way command line option
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2012 20:21:53 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:36:51 +0000 (14:36 -0700)
commitcfb6f9a...c392561bb339763564e21b684e50ce83
treedd78879...f02e6f669a3e6c4c58f3a70daceb46e6copy hash to clipboard (tree)
parentec15be0...679ed5a98e4a96b23b99dd1b90196faecopy hash to clipboard (diff)
builtin/apply.c
t/t4117-apply-reject.sh