comparison tests/test-hgweb-auth.py.out @ 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 0f1311e829c9
children 31c37e703cee
comparison
equal deleted inserted replaced
27162:4ab69be0ea15 27163:27b89a0957ec