Mercurial > hg

log tests/test-merge-types.t @ 26892:4b966aaadc45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Sun, 08 Nov 2015 23:47:20 -0800 Siddharth Agarwal test-merge-types.t: add tests for :merge-local/:merge-other with symlinks
Sun, 11 Oct 2015 21:56:39 -0700 Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Wed, 07 Oct 2015 00:27:23 -0700 Siddharth Agarwal filemerge: run symlink check for :merge3
Wed, 07 Oct 2015 00:24:44 -0700 Siddharth Agarwal filemerge: print correct name of tool for symlink checks
Wed, 07 Oct 2015 00:01:16 -0700 Siddharth Agarwal filemerge: normalize 'internal:foo' names to ':foo'
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Sun, 28 Sep 2014 17:15:28 +0200 Mads Kiilerich filemerge: switch the default name for internal tools from internal:x to :x
Wed, 06 Aug 2014 11:43:59 -0500 Matt Mackall tests: replace exit 80 with #require
Sat, 26 Jul 2014 03:32:49 +0200 Pierre-Yves David resolve: add parenthesis around "no more unresolved files" message stable
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Thu, 08 May 2014 16:50:22 -0700 Durham Goode merge: add conflict marker formatter (BC)
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Fri, 09 May 2014 14:46:50 -0500 Matt Mackall resolve: simplify "finished" message
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214)
Tue, 25 Feb 2014 20:30:08 +0100 Mads Kiilerich merge: use ancestor filename from planning phase instead of filectx ancestor
Fri, 08 Feb 2013 15:23:23 +0000 Siddharth Agarwal manifestmerge: pass in branchmerge and force separately
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay debug messages for merge actions
Wed, 30 Jan 2013 19:29:36 +0100 Mads Kiilerich merge: fix UnboundLocalError (issue3791) stable
Wed, 09 Jan 2013 02:02:45 +0100 Mads Kiilerich merge: merge file flags together with file content
Tue, 15 Jan 2013 01:05:12 +0100 Mads Kiilerich tests: better test coverage of merges of flags
Thu, 10 Jan 2013 00:44:23 +0100 Mads Kiilerich merge: changing the mode of a file is also an update
Thu, 05 Jul 2012 00:35:42 +0200 Mads Kiilerich tests: fix test markup in test-merge-types.t
Wed, 04 Apr 2012 11:18:42 +0200 Thomas Arendsen Hein test-merge-types: allow different output with existing hgmerge (issue3346) stable
Tue, 13 Mar 2012 16:28:08 -0500 Matt Mackall merge: handle linear update to symlink correctly (issue3316) stable
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Mon, 07 Nov 2011 03:14:54 +0100 Mads Kiilerich tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mon, 07 Nov 2011 03:14:54 +0100 Mads Kiilerich tests: use 'hghave symlink' for tests using symlinks
Tue, 14 Sep 2010 12:20:51 +0200 Adrian Buehlmann combine tests base tests/test-merge-types@79b11a6f7640
less more | (0) tip