Merging limitations after directory renames -- interesting test repo

Briefly,

Fetch git://dev.laptop.org/git/users/martin/etherpad and try to merge pg and master. A ton of work is left to do by hand, and you don't even get useful conflicts.

 - Many paths that shoud succeed don't seem to succeed. After using
git merge, tell me if this file doesn't look like at least git should
have _attempted_ a diff3 on it:
   gitk --all  -- etherpad/bin/rebuildjar.sh
trunk/etherpad/bin/rebuildjar.sh
trunk/trunk/etherpad/bin/rebuildjar.sh

 - Git diff seems confused, says "path needs merge" instead of giving
me a diff. May be related to the first problem
    git diff -- etherpad/bin/rebuildjar.sh

   However I can
   git diff master -- etherpad/bin/rebuildjar.sh
   git diff pg -- etherpad/bin/rebuildjar.sh

Note note! The "pg" branch you see has been artificially rebuilt so I may have made a mistake. However, I've reviewed all the commits and it seems correct. Original repo comes from SVN via hg -- see git://github.com/ether/pad.git

Most importantly, even if I misfired here or there, the resulting history of the paths reads like something git _can_ make sense of if it traces the history of the paths carefully.

cheers,

m