Mercurial > hg
comparison hgext/gpg.py @ 30161:339f9d93daa6
merge: only show "cannot merge flags for %s" warning if flags are different
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Oct 2016 12:22:18 +0200 |
parents | d5883fd055c6 |
children | 82f1ef8b4477 |
comparison
equal
deleted
inserted
replaced
30160:008c4ce64e3f | 30161:339f9d93daa6 |
---|