[MPlayer-DOCS] CVS: main/DOCS/man/en mplayer.1,1.749,1.750

[Diego Biurrun]

Guillaume POIRIER writes:
> Le lun 27/09/2004 à 21:03, Guillaume Poirier CVS a écrit :
> > CVS change done by Guillaume Poirier CVS
> 
> Darn! This patch features also the manpage update suggested by Loren
> Merritt that I got from testing Loren's patch...
> What am I supposed to do Diego? Should I revert it? Should I commit
> Loren patch?
> Help!

DO NOT REVERT!

It's too late, there were some more commits afterwards, reverting will
NOT work anymore.

Don't commit Loren's patch either, it has not been approved yet.

You will have to undo the changes you made and recommit the old
version.  The easiest way to achieve this is probably to take the man
page part of Loren's patch and apply it with 'patch -R', this should
undo the changes.

Diego