##// END OF EJS Templates
merge: make test for fast-forward merge stricter (issue619)...
merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test
Matt Mackall -
r4748:8808ea7d default
Show More
Name Size Modified Last Commit Author
/ mercurial
hgweb
__init__.py Loading ...
ancestor.py Loading ...
archival.py Loading ...
base85.c Loading ...
bdiff.c Loading ...
bundlerepo.py Loading ...
byterange.py Loading ...
changegroup.py Loading ...
changelog.py Loading ...
cmdutil.py Loading ...
commands.py Loading ...
context.py Loading ...
demandimport.py Loading ...
dirstate.py Loading ...
extensions.py Loading ...
fancyopts.py Loading ...
filelog.py Loading ...
help.py Loading ...
hg.py Loading ...
hook.py Loading ...
httprangereader.py Loading ...
httprepo.py Loading ...
i18n.py Loading ...
ignore.py Loading ...
keepalive.py Loading ...
localrepo.py Loading ...
lock.py Loading ...
lsprof.py Loading ...
mail.py Loading ...
manifest.py Loading ...
mdiff.py Loading ...
merge.py Loading ...
mpatch.c Loading ...
node.py Loading ...
patch.py Loading ...
remoterepo.py Loading ...
repair.py Loading ...
repo.py Loading ...
revlog.py Loading ...
sshrepo.py Loading ...
sshserver.py Loading ...
statichttprepo.py Loading ...
streamclone.py Loading ...
strutil.py Loading ...
templater.py Loading ...
transaction.py Loading ...
ui.py Loading ...
util.py Loading ...
util_win32.py Loading ...
verify.py Loading ...
version.py Loading ...