Comment 8 for bug 884270

Ok, I'll prototype a merge hook calling msgmerge as outlined above.

Note that remerge currently have some limitations that may reduce its usefulness, I'm not clear about the fallouts but at worst it would mean that it can be used only when the remaining conflicts are the .po related ones.

If we encounter issues around that I'll fix them but I wanted to make sure you know about the possible pitfalls.