| Wed, 11 Nov 2015 15:08:08 -0600 |
Matt Mackall |
merge with stable
|
| Wed, 04 Nov 2015 12:14:18 -0500 |
Augie Fackler |
verify: add a hook that can let extensions manipulate file lists
|
| Tue, 10 Nov 2015 17:16:59 -0800 |
Siddharth Agarwal |
resolve: don't abort when file is missing
|
| Tue, 10 Nov 2015 17:13:16 -0800 |
Siddharth Agarwal |
filemerge: treat EOF at prompt as fail, not abort
|
| Tue, 10 Nov 2015 17:10:47 -0800 |
Siddharth Agarwal |
test-merge-tools.t: add 'hg resolve --list' output to tests
|
| Tue, 10 Nov 2015 00:46:45 -0800 |
Siddharth Agarwal |
error: add structured exception for EOF at prompt
|
| Mon, 09 Nov 2015 22:37:32 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: unset HGMERGE
|
| Tue, 10 Nov 2015 23:02:59 +0800 |
Anton Shestakov |
hgweb: compute changeset parents and children for log pages lazily
|
| Sun, 08 Nov 2015 23:42:44 -0800 |
Siddharth Agarwal |
filemerge: move :merge-local/other symlink check to precheck
|
| Sun, 08 Nov 2015 23:47:20 -0800 |
Siddharth Agarwal |
test-merge-types.t: add tests for :merge-local/:merge-other with symlinks
|
| Mon, 09 Nov 2015 16:24:13 -0600 |
Matt Mackall |
Added signature for changeset 1aa5083cbebb
stable
|
| Mon, 09 Nov 2015 16:24:08 -0600 |
Matt Mackall |
Added tag 3.6.1 for changeset 1aa5083cbebb
stable
|
| Mon, 09 Nov 2015 15:53:11 -0600 |
Matt Mackall |
posix: fix test-permissions regression
stable 3.6.1
|
| Sun, 08 Nov 2015 01:10:52 +0800 |
Anton Shestakov |
dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657)
stable
|
| Mon, 09 Nov 2015 10:43:23 -0800 |
Mateusz Kwapich |
dirstate: fix filefoldmap incosistency on file delete
stable
|
