log tests/test-up-local-change.t @ 26094:df41c7be16d6

age author description
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Wed, 29 Apr 2015 21:14:59 -0400 Matt Harbison windows: make shellquote() quote any path containing '\' (issue4629) stable
Thu, 19 Mar 2015 22:22:50 +0100 Mads Kiilerich merge: better debug messages before/after invoking external merge tool
Fri, 05 Dec 2014 12:10:56 -0600 Matt Mackall merge with stable
Sun, 16 Nov 2014 23:41:44 -0800 Martin von Zweigbergk update: don't overwrite untracked ignored files on update stable
Tue, 02 Dec 2014 17:11:01 -0800 Martin von Zweigbergk update: add tests for untracked local file stable
Tue, 02 Dec 2014 16:39:59 -0800 Martin von Zweigbergk update: remove redundant and misplaced merge tests
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
Tue, 25 Feb 2014 20:29:14 +0100 Mads Kiilerich copies: when both sides made the same copy, report it as a copy
Mon, 23 Sep 2013 20:50:51 -0700 Siddharth Agarwal merge: standardize error message for dirty working dir
Mon, 23 Sep 2013 20:08:52 -0700 Siddharth Agarwal update: improve error message for dirty non-linear update with rev
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