##// END OF EJS Templates
shelve: make --keep option survive user intervention (issue5431)...
shelve: make --keep option survive user intervention (issue5431) Currently if user runs 'hg unshelve --keep' and merge conflicts occur, the information about --keep provided by user is lost and shelf is deleted after 'hg unshelve --continue'. This is obviously not desired, so this patch fixes it.
Kostia Balytskyi -
r30522:7b3136bc default
Show More
Name Size Modified Last Commit Author
/ hgext / fsmonitor
pywatchman
__init__.py Loading ...
state.py Loading ...
watchmanclient.py Loading ...