| Tue, 06 Jun 2017 22:17:39 +0530 |
Pulkit Goyal |
update: show the commit to which we updated in case of multiple heads (BC)
|
| 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)
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
| 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
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
| Wed, 07 Dec 2011 11:23:01 -0600 |
Kevin Bullock |
merge: make 'nothing to merge' aborts consistent
|
| Tue, 19 Apr 2011 12:04:44 +0200 |
Martin Geisler |
tests: remove redundant mkdir
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
| Tue, 21 Sep 2010 16:00:02 -0500 |
Matt Mackall |
tests: cleanup exit code handling in unified tests
|
| Thu, 02 Sep 2010 23:22:51 +0200 |
Martin Geisler |
tests: remove unneeded -d flags
|
| Mon, 30 Aug 2010 14:16:56 +0900 |
Nicolas Dumazet |
tests: unify test-up-local-change
base
tests/test-up-local-change@4dcc0cd992ce
|
