diff contrib/simplemerge @ 28122:6025ddb4e649

rebase: suggest the correct tool to continue (not rebase) Suggest committing (or whatever the current activity is), via wrongtooltocontinue which uses howtocontinue.
author timeless <timeless@mozdev.org>
date Thu, 04 Feb 2016 03:46:38 +0000
parents 863075fd4cd0
children d83ca854fa21
line wrap: on
line diff