Merge with master to pick up gitk --parents changes.
[git.git] / debian / compat
1 4