equal
deleted
inserted
replaced
60 other, independent patch queues with the "hg qqueue" command. |
60 other, independent patch queues with the "hg qqueue" command. |
61 |
61 |
62 If the working directory contains uncommitted files, qpush, qpop and qgoto |
62 If the working directory contains uncommitted files, qpush, qpop and qgoto |
63 abort immediately. If -f/--force is used, the changes are discarded. Setting: |
63 abort immediately. If -f/--force is used, the changes are discarded. Setting: |
64 |
64 |
65 [mq] check = True |
65 [mq] |
66 |
66 keepchanges = True |
67 make them behave as if -c/--check were passed, and non-conflicting local |
67 |
|
68 make them behave as if --keep-changes were passed, and non-conflicting local |
68 changes will be tolerated and preserved. If incompatible options such as |
69 changes will be tolerated and preserved. If incompatible options such as |
69 -f/--force or --exact are passed, this setting is ignored. |
70 -f/--force or --exact are passed, this setting is ignored. |
70 |
71 |
71 list of commands: |
72 list of commands: |
72 |
73 |