git-merge knows some strategies want to skip trivial merges
[git.git] / t / .gitignore
1 trash