builtin-am: implement --3way
authorPaul Tan <pyokagan@gmail.com>
Tue, 4 Aug 2015 13:51:41 +0000 (21:51 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2015 05:02:11 +0000 (22:02 -0700)
commit84f3de2...baf6fc6a91b95fad9a4c5468dec3ea8e
tree37f5cfe...6089582b898d0ae61a54aab323c0bc3ccopy hash to clipboard (tree)
parentd23a511...f821b91e1d72745238a4c085a089864ecopy hash to clipboard (diff)
builtin/am.c