diff hgext/keyword.py @ 26789:e6003ecf3257

commands.resolve: conclude merge driver if no unresolved files are left This can happen when either 'hg resolve --all' is called or a driver-resolved file is explicitly requested. This is done as part of 'hg resolve --all' so that users still have a chance to test their changes before committing them. The exact semantics here are still to be decided. This does not impact any non-experimental features. Thanks to Pierre-Yves David for some advice about this behavior in particular, and merge drivers in general.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:31:04 -0700
parents 56b2bcea2529
children 16cfbbc69800
line wrap: on
line diff