merge-recursive: comment and reorder the merge_options fields
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"