diff tests/test-merge-local.t @ 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 777f668eca70
children a2804ddcf9ae
line wrap: on
line diff