##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: don't auto-pick destination with `hg merge 'wdir()'`...
merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996
Martin von Zweigbergk -
r44638:1850066f default
Show More
Name Size Modified Last Commit Author
/ contrib / python-zstandard / c-ext
bufferutil.c Loading ...
compressionchunker.c Loading ...
compressiondict.c Loading ...
compressionparams.c Loading ...
compressionreader.c Loading ...
compressionwriter.c Loading ...
compressobj.c Loading ...
compressor.c Loading ...
compressoriterator.c Loading ...
constants.c Loading ...
decompressionreader.c Loading ...
decompressionwriter.c Loading ...
decompressobj.c Loading ...
decompressor.c Loading ...
decompressoriterator.c Loading ...
frameparams.c Loading ...
python-zstandard.h Loading ...