Here is what I did and the results I got. "git_merge.txt" describes the steps,
"git_log.log" and "ls_R.log" are the results of running `git log` and `ls -R`
in the parent repository (repoP). There is no svn history in `git log` because
I did not convert to git before merging, I simply cloned the src/step folder
and started making commits from there on.

git_merge.txt: https://dl.dropbox.com/u/4460937/git_merge.txt
git_log.log: https://dl.dropbox.com/u/4460937/git_log.log
ls_R.log: https://dl.dropbox.com/u/4460937/ls_R.log