| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|
| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
file |
diff |
annotate
|
| Wed, 27 Jul 2016 13:57:51 +0100 |
Christian Ebert |
keyword: avoid traceback when kwdemo is run outside a repo
stable
|
file |
diff |
annotate
|
| Wed, 30 Mar 2016 02:10:44 +0900 |
FUJIWARA Katsunori |
keyword: use templatefilter to mark a function as template filter
|
file |
diff |
annotate
|
| Fri, 15 Jan 2016 13:46:33 -0800 |
Ruslan Sayfutdinov |
backout: commit changeset by default (BC)
|
file |
diff |
annotate
|
| Wed, 02 Dec 2015 03:12:07 +0900 |
FUJIWARA Katsunori |
commands: make commit acquire locks before processing (issue4368)
|
file |
diff |
annotate
|
| Sun, 22 Nov 2015 21:40:23 -0800 |
Siddharth Agarwal |
shelve: use colon instead of quotes in 'changes to' description
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Mon, 08 Jun 2015 14:44:30 -0500 |
Matt Mackall |
tests: drop explicit $TESTDIR from executables
|
file |
diff |
annotate
|
| Thu, 23 Apr 2015 14:27:26 -0700 |
Laurent Charignon |
record: edit patch of newly added files (issue4304)
stable
|
file |
diff |
annotate
|
| Wed, 22 Apr 2015 13:56:30 -0700 |
Laurent Charignon |
record: fix record with change on moved file crashes (issue4619)
stable
|
file |
diff |
annotate
|
| Fri, 06 Mar 2015 15:57:43 -0800 |
Laurent Charignon |
record: allow editing new files (issue4304)
|
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
|
| Thu, 18 Dec 2014 12:22:43 -0800 |
Eric Sumner |
bundlerepo: retract phase boundary
|
file |
diff |
annotate
|
| Sun, 21 Dec 2014 13:02:59 +0000 |
Christian Ebert |
keyword: handle resolve to either parent
|
file |
diff |
annotate
|
| Sun, 21 Dec 2014 12:53:57 +0000 |
Christian Ebert |
keyword: update test file syntax
|
file |
diff |
annotate
|
| Wed, 01 Oct 2014 01:04:18 +0200 |
Mads Kiilerich |
ui: show prompt choice if input is not a tty but is forced to be interactive
|
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, 23 Jun 2014 13:50:44 -0500 |
Matt Mackall |
branchmap: don't use ui.warn for debug message
|
file |
diff |
annotate
|
| Mon, 09 Jun 2014 13:53:23 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 05 Jun 2014 16:47:14 +0900 |
FUJIWARA Katsunori |
keyword: suppress keyword expansion while 'hg fetch' for internal merge
stable
|
file |
diff |
annotate
|
| Thu, 05 Jun 2014 16:47:14 +0900 |
FUJIWARA Katsunori |
keyword: suppress keyword expansion while 'hg histedit' for internal merge
stable
|
file |
diff |
annotate
|
| Thu, 05 Jun 2014 16:47:14 +0900 |
FUJIWARA Katsunori |
keyword: suppress keyword expansion while 'hg backout' for internal merge
stable
|
file |
diff |
annotate
|
| Thu, 05 Jun 2014 16:47:14 +0900 |
FUJIWARA Katsunori |
keyword: suppress keyword expansion while 'hg graft' for internal merge
stable
|
file |
diff |
annotate
|
| Thu, 05 Jun 2014 16:47:13 +0900 |
FUJIWARA Katsunori |
keyword: suppress keyword expansion while 'hg rebase' for internal merge
stable
|
file |
diff |
annotate
|
| Thu, 05 Jun 2014 16:47:13 +0900 |
FUJIWARA Katsunori |
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
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
|