Renamed git_merge__extract_conflict_paths to git_merge__append_conflicts_to_merge_msg
Always capture conflict information in the MERGE_MSG file unless asked
not to.

This reverses the previous default of not adding unless asked to.