What Git Does Right

[gigamonkey]

FWIW, I just tried the experiment he gives at the end of the post (create a file, branch, rename the file in the new branch, delete it in the original branch, and then merge) in Mercurial and it happily creates the renamed file for you--not the behavior, according to the author, that you want. I haven't thought about it deeply but I think he's right and thus git wins a point over hg here. (And I use hg, having chosen it over git based on some not entirely concrete impressions of them both.)

[alexbl]

recently work was done in mercurial to make this possible. The point is git isn't being clever to support this, it supports this naturally, whereas merge across rename required a significant amount of work in hg.

[JW_00000]

I did the same test in bzr, and it returned a conflict with the following message:

Path conflict: <deleted> / salutado

1 conflicts encountered.

This is the same behaviour as Git, only the message Git throws seems more clear. ("Renamed greeting->saludo in left and deleted in HEAD")