[Omake] SVN Commit: OMake Build System (Rev. 12798)

[Aleksey Nogin]

Actually, instead of reverting the changes to generated files, we should rader
mark all them as resolved. This way the conflicts are still avoided, but
adds/deletes are fully propagated.

----
Changes in omake-branches/jumbo:
    +1 -1       merge-branch
 
A hyperlinked version of this commit is available at
http://svn.metaprl.org/commitlogs/omake/2008-03.html#08/03/19.13:14:23