merge: clarify collect_parents() logic
authorJunio C Hamano <gitster@pobox.com>
Sat, 25 Apr 2015 17:25:43 +0000 (10:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2015 20:17:53 +0000 (13:17 -0700)
commit0b10b8a...d53c7aaf42b8f14da1021ea59ea4e0ec
tree70bf1bd...fdb5083c937e663c5a8f595b52aec5b0copy hash to clipboard (tree)
parent1016658...e3fe213eedebdb478cca0324ac8fbe87copy hash to clipboard (diff)
builtin/merge.c