Mercurial > hg

log mercurial/merge.py @ 27653:198d291e9ffa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -7 tip
age author description
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal checkunknownfiles: make control flow clearer
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal _checkunknownfiles: rename 'aborts' to 'conflicts'
Sat, 02 Jan 2016 02:13:56 +0100 Matt Mackall merge with stable
Mon, 28 Dec 2015 22:51:37 -0800 Siddharth Agarwal merge: while checking for unknown files don't follow symlinks (issue5027) stable
Mon, 14 Dec 2015 20:57:21 -0500 Augie Fackler manifestmerge: have manifest do matching before diffing
Mon, 14 Dec 2015 20:47:22 -0500 Augie Fackler merge: rework manifestmerge to use a matcher
Mon, 14 Dec 2015 20:37:41 -0500 Augie Fackler merge: restate calculateupdates in terms of a matcher
less more | (0) -300 -100 -30 -10 -7 tip