Mercurial > hg
comparison tests/test-manifest-merging @ 4682:dc5920ea12f8
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.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 22 Jun 2007 20:44:40 -0300 |
| parents | 9dcf9d45cab8 |
| children |
comparison
equal
deleted
inserted
replaced
| 4680:059bdc8dfb9d | 4682:dc5920ea12f8 |
|---|