merge-recursive: Split update_stages_and_entry; only update stages at end
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:02 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:36 +0000 (14:19 -0700)
commitb8ddf16...24f2d4f29a73b89dabbb764763744abe
tree4892718...2c0c0c4067ab8541d57b2a7094140e73copy hash to clipboard (tree)
parented0148a...20ec2ec88f0574c2e107aba0a46936e1copy hash to clipboard (diff)
merge-recursive.c