merge-one-file: use empty- or common-base condintionally in two-stage merge.
[git.git] / debian / .gitignore
1 git-core
2 git-tk
3 *.debhelper
4 *.substvars
5 build-stamp
6 files