Mercurial > hg
diff hgext/keyword.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 | 56b2bcea2529 |
children | 16cfbbc69800 |