[pull req] 3-way merge tool for .po files

[P. Christeas]

Hi people,

IMHO, gettext has been missing a 3-way merge tool. The one that would 
concatenate the [A + (B - Orig)] strings. 
Surely, with msgcat we could do A+B, but not a diff. It is important to have a 
diff, because we don't want to repeat strings  that have already been "fixed" 
in 
the Orig->A procedure.

So, I gave it a try!

Please consider the patches at:
http://git.hellug.gr/?p=xrg/gettext
... revise and offer your precious feedback to my humble tries.


-- 
Say NO to spam and viruses. Stop using Microsoft Windows!