diff mercurial/mdiff.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 ff17dff99295
children 3eeb8e138e5c
line wrap: on
line diff