Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 28578:66d085e55ecd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -8 tip
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)
Tue, 01 Dec 2015 09:48:38 -0800 Siddharth Agarwal filemerge: default regular prompts to 'leave unresolved' (BC)
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts
Mon, 30 Nov 2015 11:17:18 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to regular prompts
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Tue, 24 Nov 2015 10:58:35 -0800 Siddharth Agarwal filemerge: in ':prompt', use ':fail' tool rather than returning directly
less more | (0) -100 -30 -10 -8 tip