Mercurial Mercurial > hg / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) -300 -100 -15 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
Thu, 03 Dec 2015 23:01:59 -0500 Andrew Halberstadt merge.graft: add option to keep second parent file | diff | annotate
Wed, 25 Nov 2015 14:25:33 -0800 Siddharth Agarwal merge: move almost all change/delete conflicts to resolve phase (BC) (API) file | diff | annotate
Tue, 24 Nov 2015 15:26:51 -0800 Siddharth Agarwal merge.recordupdates: mark 'a' files as added unconditionally file | diff | annotate
Mon, 30 Nov 2015 10:19:39 -0800 Siddharth Agarwal merge: add a new action type representing files to add/mark as modified file | diff | annotate
Mon, 30 Nov 2015 10:03:21 -0800 Siddharth Agarwal mergestate: add a cached property accessor for the local context file | diff | annotate
Mon, 30 Nov 2015 10:05:09 -0800 Siddharth Agarwal mergestate: raise exception if otherctx is accessed but _other isn't set file | diff | annotate
Mon, 23 Nov 2015 18:03:25 -0800 Siddharth Agarwal mergestate: explicitly forget 'dc' conflicts where the deleted side is picked file | diff | annotate
Mon, 23 Nov 2015 19:06:15 -0800 Siddharth Agarwal merge.applyupdates: add all actions returned from merge state file | diff | annotate
Sun, 22 Nov 2015 21:58:28 -0800 Siddharth Agarwal merge.applyupdates: create absentfilectxes for change/delete conflicts file | diff | annotate
Sun, 22 Nov 2015 21:59:52 -0800 Siddharth Agarwal mergestate: add methods to queue files to remove, add or get file | diff | annotate
Fri, 20 Nov 2015 16:55:01 -0800 Siddharth Agarwal mergestate: add a way to record pending dirstate actions file | diff | annotate
Sun, 15 Nov 2015 21:55:46 -0800 Siddharth Agarwal merge.recordupdates: don't require action keys to be present in dict file | diff | annotate
Fri, 20 Nov 2015 11:26:31 -0800 Siddharth Agarwal merge.applyupdates: extend action queues with ones returned from mergestate file | diff | annotate
Fri, 20 Nov 2015 16:43:25 -0800 Siddharth Agarwal mergestate: add a method to compute actions to perform on dirstate file | diff | annotate
Fri, 20 Nov 2015 16:37:39 -0800 Siddharth Agarwal merge.applyupdates: use counters from mergestate file | diff | annotate
less more (0) -300 -100 -15 tip
Mercurial