am -3: list the paths that needed 3-way fallback
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2012 16:55:21 +0000 (09:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Mar 2012 17:20:33 +0000 (10:20 -0700)
commit5d86861...925f15676a14b54062725eb11a85ffbc
tree470e0ed...80bdb355961d95ff37e4c333a5cdb701copy hash to clipboard (tree)
parent6c15a1c...3634005a0f8fb15696e154cc54b0a359copy hash to clipboard (diff)
git-am.sh