Merge branch 'jc/conflict-marker-size' into next
[git/wpalmer.git] / gitk-git / po / .gitignore
blobe358dd1903352f5cd65ac77e777ae14d6887adc0
1 *.msg