prep for using daff as git merge/diff driver