Mercurial Mercurial > hg / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-local.t
Tue, 25 Oct 2016 21:01:53 +0200 Gábor Stefanik merge: avoid superfluous filemerges when grafting through renames (issue5407) stable file | diff | annotate
Thu, 25 Aug 2016 22:02:26 +0200 Gábor Stefanik update: enable copy tracing for backwards and non-linear updates file | diff | annotate
Mon, 07 Dec 2015 20:43:24 -0800 Martin von Zweigbergk merge: refuse update/merge if there are unresolved conflicts (BC) file | diff | annotate
Tue, 10 Nov 2015 16:25:59 -0800 Christian Delahousse filemerge: choose where .orig files are kept file | diff | annotate
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge file | diff | annotate
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105) file | diff | annotate
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests file | diff | annotate
Sat, 11 Sep 2010 21:19:12 +0200 Adrian Buehlmann tests: unify test-merge-local file | diff | annotate | base
less more (0) tip
Mercurial