merge-recursive: Consolidate different update_stages functions
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:52 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700)
commit650467c...89e61815cfa1c942544a3659eda88aeb
tree046bec2...d8a74a0c18e49728f988a8670fe06ed1copy hash to clipboard (tree)
parent0c05942...87a14be4560d09299fb57117308a69d5copy hash to clipboard (diff)
merge-recursive.c