comparison hgext/blackbox.py @ 26770:3d1978cc949e

commands.resolve: print out warning when only driver-resolved files remain 'hg resolve --all' will be the canonical way to run the 'conclude' step of the merge driver.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:09:58 -0700
parents e8f9dffca36f
children ab6468270b83
comparison
equal deleted inserted replaced
26769:5b00ec4c05cb 26770:3d1978cc949e