Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added missing git config stuff

Browse source
This commit is contained in:
Albert Santoni 2014-08-27 16:51:37 -04:00
parent c1843f9d6b
commit f40357f972
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev_tools/scripts/git-attributes-git-merge-po Normal file
View file

@ -0,0 +1,2 @@
*.po merge=pofile
*.pot merge=pofile

5
dev_tools/scripts/git-config-git-merge-po Normal file
View file

@ -0,0 +1,5 @@
[merge "pofile"]
name = Gettext merge driver
driver = git merge-po %O %A %B