comparison tests/failfilemerge.py @ 28188:6411140aeda9

rebase: add potential divergent commit hashes to error message (issue5086)
author Kostia Balytskyi <ikostia@fb.com>
date Wed, 17 Feb 2016 20:31:34 +0000
parents 61f4d59e9a0b
children 424c1632fffb
comparison
equal deleted inserted replaced
28187:d3da97e58d42 28188:6411140aeda9