t6036: tests for criss-cross merges with various directory/file conflicts
[git/dscho.git] / po / .gitignore
bloba242a86e9376402cefa9dce7cee266a510a1ab80
1 /git.pot