diff tests/test-merge2.t @ 21947:b081decd9062 stable

resolve: add parenthesis around "no more unresolved files" message This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 26 Jul 2014 03:32:49 +0200
parents f2719b387380
children 1850066f9e36
line wrap: on
line diff