merge-recursive: comment and reorder the merge_options fields
[git] / t / t4013 / diff.diff_--name-status_dir2_dir
1 $ git diff --name-status dir2 dir
2 $