apply: document --3way option
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 21:08:29 +0000 (14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:40:03 +0000 (14:40 -0700)
commit78fb67f31edbdcde3580f9abc1048f4630ef1bee
tree432a434874a03202c3e1c0ae089741b5be205809
parentf2633ebd766b7f5817ae0ec69060170bb9b1501f
apply: document --3way option

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-apply.txt