diff tests/test-context.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 01489fa0bbbe
children 5edde05ff58e
line wrap: on
line diff