Mercurial > hg-stable

diff mercurial/win32.py @ 27162:4ab69be0ea15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d6beeb618700
children 392633d7860e
line wrap: on
line diff