diff mercurial/simplemerge.py @ 34459:d5c5cc767b7e

extdata: ignore ambiguous identifier as well
author Yuya Nishihara <yuya@tcha.org>
date Sun, 01 Oct 2017 11:56:41 +0100
parents 6330df9d6393
children 93c4958d987c
line wrap: on
line diff