Mercurial > hg

view mercurial/__init__.py @ 22673:16a46003b50c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9117c6561b0b
children 4374d819ccd5
line wrap: on
line source