Mercurial > hg

log tests/test-merge-remove.t @ 27599:ad5966de3c9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -3 tip
age author description
Wed, 23 Dec 2015 12:51:45 -0800 Siddharth Agarwal filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts
Wed, 25 Nov 2015 14:25:33 -0800 Siddharth Agarwal merge: move almost all change/delete conflicts to resolve phase (BC) (API)
less more | (0) -3 tip