| Tue, 29 Sep 2015 16:17:32 -0700 |
Gregory Szorc |
sslutil: expose attribute indicating whether SNI is supported
|
| Sun, 11 Oct 2015 23:58:07 -0700 |
Siddharth Agarwal |
resolve: perform all premerges before performing any file merges (BC)
|
| Sun, 11 Oct 2015 23:56:44 -0700 |
Siddharth Agarwal |
test-resolve.t: add some tests for .orig file contents
|
| Sun, 11 Oct 2015 23:54:40 -0700 |
Siddharth Agarwal |
test-resolve.t: add some output to show order of operations
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
| Sun, 11 Oct 2015 20:12:12 -0700 |
Siddharth Agarwal |
merge: introduce a preresolve function
|
| Sun, 11 Oct 2015 18:37:54 -0700 |
Siddharth Agarwal |
merge.mergestate._resolve: also return completed status
|
| Sun, 11 Oct 2015 18:29:50 -0700 |
Siddharth Agarwal |
merge.mergestate: add a wrapper around resolve
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Sun, 11 Oct 2015 15:04:00 -0700 |
Siddharth Agarwal |
filemerge: clean up some dead code
|
| Mon, 12 Oct 2015 14:15:04 -0400 |
Augie Fackler |
run-tests: add b-prefix on two strings to fix python3 support
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
| Sun, 11 Oct 2015 20:04:40 -0700 |
Siddharth Agarwal |
filemerge: only copy to backup during premerge step
|
| Sun, 11 Oct 2015 20:02:53 -0700 |
Siddharth Agarwal |
filemerge: only print out "merging f" output at premerge step
|
| Thu, 08 Oct 2015 00:19:20 -0700 |
Siddharth Agarwal |
filemerge: deindent the parts of filemerge outside the try block
|
