### Installing * copy mergetool to a locaton `<pathto>` * Add this to your .git/config or ~/.gitconfig: [merge "po-merge"] name = Gettext merge driver driver = <patho> %O %A %B Add this to .gitattributes in some dir: *.po merge=po-merge *.pot merge=po-merge ### Testing To run the testsuite simply run runtests.py in the topdir. For each test there is a subfolder in the test dir with folling files: * base, local and remote - the 3 files for a 3-way merge * merged - the file after the merge is done * pot - the corresponding pot file, to get a cleaner picture for sorting and removal context. to create such an file run: msghack --empty remote > pot you can simply look into the examples and run diff to see what is done. ### Documentation I didn't have written the different po merge tools. I found them at the internet :D https://stackoverflow.com/questions/16214067/wheres-the-3-way-git-merge-driver-for-po-gettext-files https://github.com/mezis/git-whistles/blob/master/libexec/git-merge-po.sh
Hefee
authored
Name | Last commit | Last update |
---|---|---|
tests | ||
README | ||
git-merge-po.sh | ||
mergetool | ||
runtests.py | ||
stackoverflow-16214067 | ||
stackoverflow-16214067.2 |