Commit History

Author SHA1 Message Date
  Raphaël Hertzog 5c233019cc dpkg-mergechangelogs: use 7 characters for conflict markers 15 years ago
  Niels Thykier 64dc71b84f dpkg-mergechangelogs: fail if it cannot close the output file 15 years ago
  Guillem Jover c6ea15b985 Cleanup white spaces 16 years ago
  Raphaël Hertzog 021de2418c dpkg-mergechangelogs: add missing call to textdomain() 16 years ago
  Raphaël Hertzog 9eb5c777c5 dpkg-mergechangelogs: avoid using UTF-8 on translatable strings 16 years ago
  Raphaël Hertzog 9b98847665 dpkg-mergechangelogs: new script doing 3-way merge of Debian changelogs 16 years ago