##// END OF EJS Templates
merge: fix small bug with a failed merge across a rename...
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.
Alexis S. L. Carvalho -
r4682:dc5920ea default
Show More
Name Size Modified Last Commit Author
contrib
doc
hgext
mercurial
templates
tests
.hgignore Loading ...
.hgsigs Loading ...
.hgtags Loading ...
CONTRIBUTORS Loading ...
COPYING Loading ...
Makefile Loading ...
README Loading ...
hg Loading ...
hgeditor Loading ...
hgmerge Loading ...
hgweb.cgi Loading ...
hgwebdir.cgi Loading ...
setup.py Loading ...

Basic install:

$ make # see install targets
$ make install # do a system-wide install
$ hg debuginstall # sanity-check setup
$ hg # see help

See http://www.selenic.com/mercurial/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.