Mercurial > hg

annotate hgext/__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 7d439981bec4
children 155e3308289c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1360
7d439981bec4 Re-add hgext/__init__.py
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 # placeholder