Files not deleted when merging after a rename

Hi,

I've run across a small problem and I was wondering if I could get some help. I have two users A and B. They are both git-cloned from a common repository on a different server.

User A moves a directory: foo/bar/ ==> bar using: git mv foo/bar bar git commit git push

Meanwhile, user B is doing some other changes that are completely unrelated and has a few local commits. Now, when user B pulls from the repository (git pull), and returns no errors merging, the directory "bar" is created, but "foo/bar" is not deleted, although, it becomes untracked.

Any ideas why the merge isn't deleting foo/bar? The users are using git version 1.5.2.5 in Ubuntu Hoary. Thanks in advance.

-Mark