| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
| Fri, 06 Nov 2015 22:32:00 +0800 |
Anton Shestakov |
monoblue: add a space to separate navigation links in file log footer
|
| Thu, 12 Nov 2015 13:14:03 -0800 |
Martin von Zweigbergk |
merge: move messages about possible conflicts a litte earlier
|
| Sun, 01 Nov 2015 15:46:06 +0900 |
Yuya Nishihara |
import-checker: include lineno in warning message
|
| Sun, 01 Nov 2015 15:39:25 +0900 |
Yuya Nishihara |
import-checker: extract function to generate a formatted warning
|
| Sun, 01 Nov 2015 13:53:05 +0900 |
Yuya Nishihara |
import-checker: make it executable for convenience
|
| Mon, 09 Nov 2015 17:20:50 -0500 |
Matt Harbison |
test-fileset: glob the updated file count for Windows stability
|
| Mon, 09 Nov 2015 13:12:35 -0500 |
Matt Harbison |
tests: tolerate differences between Linux and Windows error strings
|
| Mon, 09 Nov 2015 12:51:58 -0500 |
Matt Harbison |
test-largefiles-cache: add glob for Windows
|
| Mon, 09 Nov 2015 12:49:31 -0500 |
Matt Harbison |
tests: make 'f' tool open files in binary mode when hexdumping
|
| Thu, 12 Nov 2015 14:29:02 -0800 |
Siddharth Agarwal |
merge.applyupdates: only attempt to merge files in mergeactions
|
| Wed, 11 Nov 2015 17:34:28 -0800 |
Siddharth Agarwal |
filemerge: rename _symlinkcheck to _mergecheck
|
| Wed, 11 Nov 2015 17:32:41 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: rename to test-merge-changedelete.t
|
| Thu, 12 Nov 2015 20:48:41 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 12 Nov 2015 13:16:04 -0800 |
Gregory Szorc |
tags: create new sortdict for performance reasons
stable
|
| Tue, 10 Nov 2015 15:08:56 -0800 |
Christian Delahousse |
largefiles: specify where .orig files are kept
|
| Tue, 10 Nov 2015 14:52:54 -0800 |
Christian Delahousse |
mq: let the user choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:41:14 -0800 |
Christian Delahousse |
shelve: choose where .orig file locations are kept
|
| Tue, 10 Nov 2015 16:25:59 -0800 |
Christian Delahousse |
filemerge: choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:29:13 -0800 |
Christian Delahousse |
git-subrepos: revert respects specified location to save .orig files
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
| Thu, 12 Nov 2015 17:00:08 -0600 |
Christian Delahousse |
revert: allow configuring the .orig file location
|
| Thu, 12 Nov 2015 16:56:06 -0600 |
Christian Delahousse |
cmdutil: add origbackuppath helper
|
| Tue, 10 Nov 2015 11:16:25 -0800 |
Ryan McElroy |
discovery: pass pushop to _nowarnheads
|
| Tue, 10 Nov 2015 11:13:21 -0800 |
Ryan McElroy |
exchange: pass pushop to discovery.checkheads
|
| Thu, 12 Nov 2015 15:26:30 -0600 |
Matt Mackall |
merge with stable
|
| Fri, 13 Nov 2015 02:36:30 +0900 |
FUJIWARA Katsunori |
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)
stable
|
| Sat, 07 Nov 2015 13:48:42 -0500 |
Pierre-Yves David |
test: use generaldelta in 'test-clonebundle.t'
|
| Tue, 20 Oct 2015 13:14:04 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh.t'
|
| Tue, 20 Oct 2015 13:14:31 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh-bundle1.t'
|
