##// 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
Gregory Szorc - - Load All Authors

File last commit:

r42237:675775c3 default
r44638:1850066f default
Show More
MANIFEST.in
9 lines | 139 B | text/plain | TextLexer
/ contrib / python-zstandard / MANIFEST.in
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
 r30822 graft c-ext
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
 r40157 graft debian
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
 r30435 graft zstd
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
 r37513 graft tests
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
 r30435 include make_cffi.py
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
 r30822 include setup_zstd.py
include zstd.c
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
 r37513 include LICENSE
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
 r40157 include NEWS.rst