Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 18:25:59 +0000 (11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 18:25:59 +0000 (11:25 -0700)
commit174f9e6...2fde6c874ba3d53eb05d0f37d6001ba5
treea35f4a0...84705f95b9679b7efa326740a79d74a6copy hash to clipboard (tree)
parent8a81d5f...f81c8e42927b4361bc93ddfc345393b7copy hash to clipboard (diff)
parent715a51b...af4f8625e99a972326bfce3fdace3071copy hash to clipboard (diff)
builtin/am.c