comparison tests/test-newbranch.t @ 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 7d4219512823
children 7731a2281cf0
comparison
equal deleted inserted replaced
20869:9658a79968c6 20871:e01cff65f4c5