]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blob - .gitattributes
only_committed_changes could fail in a git repository merged with git merge -s ours.
[git.ikiwiki.info.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs