comparison mercurial/formatter.py @ 26352:e635bc9bb7d9

resolve: consistently describe re-merge + unresolved
author timeless@mozdev.org
date Fri, 25 Sep 2015 03:51:46 -0400
parents 175873e36d03
children 55de800937e0
comparison
equal deleted inserted replaced
26351:8c7d8d5e1e0f 26352:e635bc9bb7d9