Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:23 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:23 +0000 (13:22 -0700)
commit3d55eea...05c5451afd0a56a4f5aa045ba63083f9
tree4f38cb2...b86d9aa347dd4358ec3f511fb7dc52c3copy hash to clipboard (tree)
parent2b6456b...089e42232d80672525edbe411ba41549copy hash to clipboard (diff)
parent715a51b...af4f8625e99a972326bfce3fdace3071copy hash to clipboard (diff)
builtin/am.c