Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 27599:ad5966de3c9a
age | author | description |
---|---|---|
Wed, 23 Dec 2015 12:51:45 -0800 | Siddharth Agarwal | filemerge: default change/delete conflicts to 'leave unresolved' (BC) |
Tue, 01 Dec 2015 09:48:38 -0800 | Siddharth Agarwal | filemerge: default regular prompts to 'leave unresolved' (BC) |