[Freeciv-Dev] A clever way to update patches.

[Gregory Berkolaiko <Gregory.Berkolaiko@xxxxxxxxxxxx>]

Is there a clever way to update patches?
What I usually do is apply the patch over the old version of the code, 
then do 
cvs up
and then resolve the conflicts by hand.

I could also do 
cvs up 
first and then do
patch < ....
and work with the rejects files.  although I prefer CVS way of denoting 
conflics.

But maybe there is some fancy editor that can highlight the conflicting 
parts in the patch and the code so I can change the patch itself, before 
I try to apply it?

Is xmerge any good?

Best,
G.