Fix a merge case with files added in both heads but different
[stgit] / debian / rules
2006-10-20 Catalin MarinasAdd Debian package support to StGIT