| Fri, 13 Nov 2015 22:43:09 -0800 |
Siddharth Agarwal |
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
|
| Fri, 13 Nov 2015 14:24:22 -0800 |
Siddharth Agarwal |
merge: stop emptying out 'cd' and 'dc' actions
|
| Sun, 15 Nov 2015 22:18:48 +0100 |
liscju |
rebase: add returning value from pullrebase function
stable
|
| 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
|
