| Fri, 23 May 2014 13:10:31 -0700 |
Siddharth Agarwal |
resolve: don't abort resolve -l even when no merge is in progress
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:55:56 -0700 |
Durham Goode |
rebase: specify custom conflict marker labels for rebase (BC)
|
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
|
| Fri, 18 Apr 2014 19:08:32 -0700 |
Gregory Szorc |
resolve: abort when not applicable (BC)
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
tests: make unshelve tests more tricky - don't depend on size change
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
shelve: introduce secret option for using fixed date for temporary commit
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 22:56:10 +0100 |
Simon Heimberg |
tests: rewrite path in test-shelve.t for not being mangled on msys
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:54:40 +0100 |
Mads Kiilerich |
shelve: better (and slightly redundant) test coverage for unshelve conflicts
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:54:27 +0100 |
Mads Kiilerich |
shelve: status messages from unshelve
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:54:12 +0100 |
Mads Kiilerich |
shelve: be quiet when unshelve pulls from the shelve bundle
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:53:27 +0100 |
Mads Kiilerich |
shelve: add 'changes to' prefix to default shelve message
|
file |
diff |
annotate
|
| Tue, 26 Nov 2013 16:30:52 -0800 |
Durham Goode |
unshelve: add tests for unknown files
stable
|
file |
diff |
annotate
|
| Thu, 07 Nov 2013 20:36:26 -0800 |
David Soria Parra |
shelve: unshelve using an unfiltered repository
stable
|
file |
diff |
annotate
|