diff hgext/keyword.py @ 18543:c8ba98bf0e71

merge: don't indent "local changed %s which remote deleted" prompt It was usually not shown in a context where indentation helped readability and it was inconsistent with other prompts.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 04 Feb 2013 02:46:53 +0100
parents 9fcea3f47a3a
children f0564402d059
line wrap: on
line diff