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

[Aleksey Nogin]

- The changes in omake:branch-baserev are themselves a source of potential
  conflict, we need to be careful not to create one.
- When nothing was changed, do not commit the dummy change in the
  omake:branch-baserev property.
- The redo-branch script was only needed to redo the branches, deleting it
  now.

----
Changes in omake-branches/jumbo:
    +37 -8      merge-branch
    Deleted     redo-branch
 
A hyperlinked version of this commit is available at
http://svn.metaprl.org/commitlogs/omake/2007-08.html#07/08/03.20:27:08