Add a test for read-tree -u --reset with a D/F conflict

[git.git] / templates / branches--

: this is just to ensure the directory exists.