Mercurial > hg
diff .editorconfig @ 30162:5cb830801855
merge: clarify warning for (not) merging flags without ancestor
Give hints why it can't merge and what it will do instead.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Oct 2016 12:22:18 +0200 |
parents | d30fdd6d1bf7 |
children | 1d6066336d7b |