Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 28578:66d085e55ecd
age | author | description |
---|---|---|
Thu, 17 Mar 2016 00:36:01 +0000 | timeless | filemerge: indicate that local/other are p1/p2 |
Sat, 02 Jan 2016 03:02:57 -0800 | Siddharth Agarwal | origpath: move from cmdutil to scmutil |
Wed, 23 Dec 2015 12:51:45 -0800 | Siddharth Agarwal | filemerge: default change/delete conflicts to 'leave unresolved' (BC) |