Mercurial > hg-stable
comparison mercurial/dispatch.py @ 27162:4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
'Regular' here means anything that isn't a change/delete prompt. We'll add this
option to change/delete prompts in a subsequent patch.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 30 Nov 2015 11:17:18 -0800 |
| parents | 77850d2a161c |
| children | eadbbd14bdc1 |
comparison
equal
deleted
inserted
replaced
| 27161:296d55def9c4 | 27162:4ab69be0ea15 |
|---|