1 Commits

Author	SHA1	Message	Date
Alexis S. L. Carvalho	cc6e60f60e	merge: fix small bug with a failed merge across a rename ... If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.	2007-06-22 20:44:40 -03:00