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)
|
Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
Wed, 09 Sep 2015 22:27:48 -0400 |
Matt Harbison |
extdiff: enable -I/-X with --patch
|
Wed, 09 Sep 2015 21:07:38 -0400 |
Matt Harbison |
extdiff: add a --patch argument for diffing changeset deltas
|
Mon, 15 Jun 2015 16:50:31 -0400 |
Matt Harbison |
convert: update 'intermediate-source' in the destination's extras dictionary
|
Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
Sun, 05 Apr 2015 12:12:02 -0700 |
Durham Goode |
graft: record intermediate grafts in extras
|
Sun, 05 Apr 2015 11:55:38 -0700 |
Durham Goode |
graft: allow creating sibling grafts
|
Tue, 20 Jan 2015 15:05:44 -0800 |
Ryan McElroy |
commit: remove reverse search for copy source when not in parent (issue4476)
stable
|
Sat, 17 Jan 2015 22:01:14 -0200 |
Wagner Bruna |
messages: quote "hg help" hints consistently
|
Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
Fri, 18 Apr 2014 13:33:20 +0200 |
Mads Kiilerich |
localrepo: show headline notes in commitctx before showing filenames
|
Tue, 09 Dec 2014 14:45:12 -0500 |
Augie Fackler |
test-graft: use strip extension instead of mq extension
|
Tue, 09 Dec 2014 12:39:23 -0600 |
Matt Mackall |
graft: drop cset description from empty commit message
|
Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: show hashes in user-facing messages
|
Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: give helpful warning for empty grafts
|
Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: show more useful status information while grafting
|
Tue, 09 Dec 2014 03:37:55 +0100 |
Mads Kiilerich |
tests: test coverage for empty graft
|
Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
Wed, 03 Dec 2014 15:03:29 -0800 |
Martin von Zweigbergk |
graft: use a real conflict for the tests
|
Mon, 03 Nov 2014 12:08:03 -0500 |
Matt Harbison |
templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
stable
|
Sat, 11 Oct 2014 14:05:09 -0500 |
Matt Mackall |
dirstate: merge falls through to otherparent
|
Wed, 27 Aug 2014 18:35:34 +0200 |
Matt Mackall |
merge with stable
|
Wed, 27 Aug 2014 15:30:09 +0200 |
Mads Kiilerich |
graft: fix collision detection with origin revisions that are missing
stable
|
Sat, 26 Jul 2014 14:54:36 -0700 |
Siddharth Agarwal |
graft: make --force apply across continues (issue3220)
|
Fri, 25 Jul 2014 18:21:16 -0700 |
Siddharth Agarwal |
graft: allow regrafting ancestors with --force (issue3220)
|
Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|