merge-recursive: fix logic ordering issue
authorElijah Newren <newren@gmail.com>
Fri, 5 Jan 2018 20:20:00 +0000 (12:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jan 2018 22:44:18 +0000 (14:44 -0800)
commit6c8647d...5c84bac9039135652ce5e4beb763e5be
tree27e2a3d...e42968877bb4859d166fa8345e6cc6a6copy hash to clipboard (tree)
parent7c5585f...488638a3754368f090ad6b6576c6714bcopy hash to clipboard (diff)
merge-recursive.c