Merge branch 'en/merge-recursive-fixes'

* en/merge-recursive-fixes:
merge-recursive: add explanation for src_entry and dst_entry
merge-recursive: fix logic ordering issue
Tighten and correct a few testcases for merging and cherry-picking

diff --cc merge-recursive.c
Simple merge