Introduce git_merge__extract_conflict_paths
Added cherry-pick support
Added cherry pick tests
Capture conflict information in MERGE_MSG for revert and merge