| Wed, 23 Dec 2015 12:41:20 -0800 |
Siddharth Agarwal |
tests: explicitly request changed version in c/d conflict in test-commit-amend.t
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
file |
diff |
annotate
|
| Tue, 20 Oct 2015 12:09:18 +0200 |
Pierre-Yves David |
test: use general delta for 'test-commit-amend.t'
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
cmdutil: make in-memory changes visible to external editor (issue4378)
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Mon, 01 Jun 2015 14:47:02 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 02 Jun 2015 02:28:33 +0900 |
FUJIWARA Katsunori |
templatekw: compare target context and its parent exactly (issue4690)
stable 3.4.1
|
file |
diff |
annotate
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
file |
diff |
annotate
|
| Fri, 22 May 2015 17:08:59 -0500 |
Matt Mackall |
branch: don't warn about branches if repository has multiple branches already
|
file |
diff |
annotate
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
file |
diff |
annotate
|
| Sun, 08 Mar 2015 00:04:03 -0500 |
Matt Harbison |
test-commit-amend: add globs for Windows
|
file |
diff |
annotate
|
| Mon, 02 Mar 2015 19:01:00 +0000 |
Pierre-Yves David |
amend: check for directory renames for both merge parents (issue4516)
stable
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 13:33:20 +0200 |
Mads Kiilerich |
localrepo: show headline notes in commitctx before showing filenames
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 19:43:32 +0200 |
Mads Kiilerich |
bundle: when verbose, show what takes up the space in the generated bundle
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 15:09:43 +0900 |
FUJIWARA Katsunori |
memctx: calculate manifest correctly with newly-removed files (issue4470)
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 15:09:43 +0900 |
FUJIWARA Katsunori |
memctx: calculate manifest including newly added files correctly
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 15:09:38 +0900 |
FUJIWARA Katsunori |
memctx: calculate exact status being committed from specified files
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: show more useful status information while grafting
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 22:47:38 +0200 |
Mads Kiilerich |
spelling: fixes from proofreading of spell checker issues
|
file |
diff |
annotate
|
| Thu, 16 Oct 2014 06:35:06 -0700 |
Ryan McElroy |
amend: fix amending rename commit with diverged topologies (issue4405)
stable
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 13:34:57 -0700 |
Durham Goode |
obsolete: update test-commit-amend to use obsolete option
|
file |
diff |
annotate
|
| Sat, 16 Aug 2014 10:43:59 +0900 |
FUJIWARA Katsunori |
commit: change "editform" to distinguish merge commits from other (--amend)
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
file |
diff |
annotate
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
file |
diff |
annotate
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
file |
diff |
annotate
|
| Wed, 16 Apr 2014 02:38:11 +0900 |
FUJIWARA Katsunori |
amend: invoke editor forcibly when "--edit" option is specified
|
file |
diff |
annotate
|
| Wed, 19 Mar 2014 01:07:41 +0900 |
FUJIWARA Katsunori |
amend: save commit message into ".hg/last-message.txt"
stable
|
file |
diff |
annotate
|