diff contrib/showstack.py @ 26768:ac68769a5985

merge.mergestate: only check for merge driver when property is accessed Otherwise 'hg update --clean', 'hg rebase --abort' etc wouldn't work.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:04:46 -0700
parents bdac264e5ed4
children f2fe7b199bb4
line wrap: on
line diff