HomePhabricator

resolve: don't abort resolve -l even when no merge is in progress

Authored by sid0.

Description

resolve: don't abort resolve -l even when no merge is in progress

This broke some internal automation that was quite reasonably checking for
unresolved files as a way to determine whether a merge happened cleanly. We
still abort for resolve --mark etc.

Details

Committed
sid0May 23 2014, 4:10 PM
Parents
rHG0c4077905932: run-tests: assign value to ESCAPEMAP - dict.update do not return self
Branches
Unknown
Tags
Unknown