log mercurial/merge.py @ 24334:eda2f36889b5

age author description
Fri, 30 Jan 2015 04:59:05 +0900 FUJIWARA Katsunori merge: mark .hgsubstate as possibly dirty before submerge for consistency stable