apply: plug the three-way merge logic in
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 May 2012 23:10:51 +0000 (16:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:40:02 +0000 (14:40 -0700)
commit28ff051...68463e93613998a017a10d3de45abbc0
tree442aa6c...99280c47dc42a8b4762d9638ca7a7af3copy hash to clipboard (tree)
parent519d1a5...4e044459bd7323cfa6a7cb98cec5c884copy hash to clipboard (diff)
builtin/apply.c