diff mercurial/util.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 9b230a8e6008
children 7356e6b1f5b8
line wrap: on
line diff