diff mercurial/dirstate.py @ 26352:e635bc9bb7d9

resolve: consistently describe re-merge + unresolved
author timeless@mozdev.org
date Fri, 25 Sep 2015 03:51:46 -0400
parents 1ffc61c4e32e
children 3a0bb61371c5
line wrap: on
line diff