Mercurial > hg
comparison mercurial/dummycert.pem @ 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 | d7f7f1860f00 |
| children |
comparison
equal
deleted
inserted
replaced
| 30160:008c4ce64e3f | 30161:339f9d93daa6 |
|---|