Mercurial > hg

comparison tests/test-extdiff @ 4682:dc5920ea12f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 797c6e70092b
children 2be225ea5722
comparison
equal deleted inserted replaced
4680:059bdc8dfb9d 4682:dc5920ea12f8