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

[Ralf Wildenhues]

Hello P.,
(any chance you could fill in a real name there?)

* P. Christeas wrote on Tue, Nov 23, 2010 at 10:14:48AM CET:
> 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.

FWIW I cannot speak for Bruno, but the git URL gives me:

$ git clone http://git.hellug.gr/?p=xrg/gettext
Cloning into gettext...
fatal: http://git.hellug.gr/?p=xrg/gettext/info/refs not found: did you run git 
update-server-info on the server?

indicating that the git repository has not been set up correctly.

Thanks,
Ralf