Fix the way merge points are computed.
treec025a1e914ecec8fff31d0475c0a3f66077c4160
-rwxr-xr-x 11258 svn-merge2git.sh