Mercurial > hg

log tests/test-rename-merge2.t @ 23482:208ec8ca7c79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Wed, 03 Dec 2014 14:03:20 -0800 Martin von Zweigbergk merge: make 'keep' message more descriptive
Mon, 24 Nov 2014 16:42:36 -0800 Martin von Zweigbergk merge: break out "both renamed a -> b" case
Mon, 24 Nov 2014 16:16:34 -0800 Martin von Zweigbergk merge: separate out "both created" cases
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Fri, 02 May 2014 01:09:14 +0200 Mads Kiilerich merge: change priority / ordering of merge actions
Mon, 07 Apr 2014 02:12:28 +0200 Mads Kiilerich merge: let manifestmerge emit 'keep' actions when keeping wd version
Sun, 13 Apr 2014 19:01:00 +0200 Mads Kiilerich spelling: fixes from spell checker
Sun, 02 Mar 2014 18:52:16 +0100 Mads Kiilerich merge: keep destination filename as key in filemerge actions
Tue, 25 Feb 2014 20:29:14 +0100 Mads Kiilerich copies: when both sides made the same copy, report it as a copy
Tue, 25 Feb 2014 20:28:40 +0100 Mads Kiilerich tests: add systematic test of merge ancestor calculation
Mon, 29 Apr 2013 15:58:15 +0900 FUJIWARA Katsunori merge: increase safety of parallel updating/removing on icasefs stable
Sat, 09 Feb 2013 15:22:10 -0800 Bryan O'Sullivan tests: getremove test output changes (fold into previous patch)
Sat, 09 Feb 2013 15:22:04 -0800 Bryan O'Sullivan tests: update test output (will be folded into parent)
Fri, 08 Feb 2013 15:23:23 +0000 Siddharth Agarwal manifestmerge: pass in branchmerge and force separately
Mon, 04 Feb 2013 02:46:53 +0100 Mads Kiilerich merge: don't indent "local changed %s which remote deleted" prompt
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay debug messages for merge actions
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay prompts a bit and show them in (extra) sorted order
Wed, 12 Dec 2012 02:38:14 +0100 Mads Kiilerich copies: report found copies sorted
Wed, 26 Dec 2012 15:03:58 -0800 Siddharth Agarwal copies: make debug messages more sensible
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Wed, 23 May 2012 21:34:29 +0200 Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Tue, 19 Apr 2011 12:04:44 +0200 Martin Geisler tests: remove redundant mkdir
Tue, 19 Oct 2010 22:33:52 -0500 Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable
Sun, 10 Oct 2010 09:50:25 -0500 Dan Villiom Podlaski Christiansen merge: make 'diverging renames' diagnostic a more helpful note.
Sat, 16 Oct 2010 18:09:01 +0200 Adrian Buehlmann check-code: add 'no tab indent' check for unified tests
Sun, 26 Sep 2010 13:44:49 -0500 Matt Mackall tests: unify test-rename-merge2 base tests/test-rename-merge2@8a1e405cec26
less more | (0) tip