Mercurial > hg
comparison mercurial/scmwindows.py @ 27163:27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
We're going to make this option the default in an upcoming patch.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 30 Nov 2015 13:43:55 -0800 |
parents | adae8928fe09 |
children | 029f02757c20 |
comparison
equal
deleted
inserted
replaced
27162:4ab69be0ea15 | 27163:27b89a0957ec |
---|