diff tests/test-merge-force.t @ 23525:4f18e80d9c30

rebase: show more useful status information while rebasing Show status messages while rebasing, similar to what graft do: rebasing 12:2647734878ef "fork" (tip) This gives more context for the user when resolving conflicts.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 09 Dec 2014 03:45:26 +0100
parents eeecf29cc397
children 4dd8a6a1240d
line wrap: on
line diff