Mercurial > hg
comparison mercurial/bdiff.c @ 22179:46308fadaa15 stable
merge: show the scary multiple ancestor hint for merges only, not for updates
Updates with uncommited changes will always only have one ancestor - the parent
revision. Updates between existing revision should (and will) always give the
same result no matter which ancestor is used. The warning is thus only relevant
when doing a "real" merge.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 15 Aug 2014 02:39:01 +0200 |
parents | 66b21ce60a19 |
children | e868d8ee7c8f |
comparison
equal
deleted
inserted
replaced
22178:70383c6961b4 | 22179:46308fadaa15 |
---|