log tests/test-up-local-change.t @ 31741:728d37353e1e

age author description
Tue, 25 Oct 2016 21:01:53 +0200 Gábor Stefanik merge: avoid superfluous filemerges when grafting through renames (issue5407) stable
Thu, 25 Aug 2016 22:02:26 +0200 Gábor Stefanik update: enable copy tracing for backwards and non-linear updates
Sat, 11 Jun 2016 20:59:49 +0200 Denis Laxalde tests: drop a duplicated instruction
Mon, 29 Feb 2016 01:01:20 -0500 Matt Harbison tests: flag Windows specific lines about background closing as optional
Tue, 02 Feb 2016 15:24:11 +0000 Pierre-Yves David update: change default destination to tipmost descendant (issue4673) (BC)
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Sun, 11 Oct 2015 21:56:39 -0700 Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)