merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / RelNotes
1 Documentation/RelNotes-1.7.3.txt