comparison hgext/color.py @ 20871:e01cff65f4c5 stable

backout: document return code of merge conflict
author Yuya Nishihara <yuya@tcha.org>
date Sat, 08 Mar 2014 18:41:56 +0900
parents 7e627fe63e5e
children 0084fcd5d7e2
comparison
equal deleted inserted replaced
20869:9658a79968c6 20871:e01cff65f4c5