http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram
This is a bit puzzling. I understand better merging isn't the only reason to choose DVCS, but the above page basically says that Mercurial just uses whatever external merge program it can find. So the file-level merging sounds like it must really be no different from other VCSs. So it is really just proper merging of directory renames and the like that make it superior? --bb _______________________________________________ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion