diff tests/test-stabilize-conflict.t @ 1152:be6eff57d5bb stable

evolve: add missing newlines in "parents are not common" hint
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 05 Nov 2014 15:32:25 -0800
parents a44a26f8cc48
children a1f5a948420d
line wrap: on
line diff