merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t7500 / add-content
1 #!/bin/sh
2 echo "commit message" >> "$1"
3 exit 0