[fpc-devel] FPC 2.6.x branched, trunk becomes 2.7.1

[Marco van de Voort]

In our previous episode, Michael Schnell said:
> >
> > Before branching all makefiles were regenerated, so an update will be big.
> >
> 
> OK, But why does svn show many Makefiles as conflicting instead of just 
> updating them ?

Most likely because you have local modifications to those files, from own
running of fpcmake.

My checkouts on various (windows and *nix) machines updated flawlessly