Mercurial > hg
comparison .hgsigs @ 21171:33737ebc6f39 stable
merge: tell the user when we are using bid merge
Bid merge is a new rarely used feature that the user explicitly enabled - we
should tell/warn when the user actually is using it, just like we tell when we
not are using it.
Give a message like
note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 18 Apr 2014 13:33:20 +0200 |
parents | d924e387604f |
children | cadad384c97c |
comparison
equal
deleted
inserted
replaced
21170:ea3972243320 | 21171:33737ebc6f39 |
---|