merge-recursive: add explanation for src_entry and dst_entry
authorElijah Newren <newren@gmail.com>
Fri, 5 Jan 2018 20:20:01 +0000 (12:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jan 2018 22:44:18 +0000 (14:44 -0800)
commit379fc37...6611f677b76400f6f7d0ed0faf2a9739
treed0bfec3...5398a014375a44dc508300f7d23ba810copy hash to clipboard (tree)
parent6c8647d...5c84bac9039135652ce5e4beb763e5becopy hash to clipboard (diff)
merge-recursive.c