comparison mercurial/windows.py @ 22673:16a46003b50c

merge: mute the status message when bid merge kicks in Bid merge is now the default and it is not necessary to tell the user that an experimental feature kicked in. (It could however still be relevant to get a notice that it is one of the rare criss-cross merge situations so the user is warned that the situation is more tricky than usual.)
author Mads Kiilerich <madski@unity3d.com>
date Wed, 01 Oct 2014 03:42:00 +0200
parents 234e4c24b980
children 1642eb429536
comparison
equal deleted inserted replaced
22672:19903277f035 22673:16a46003b50c