merge-recursive: use find_commit_subject() instead of custom code