Sun, 13 Aug 2017 22:46:16 -0700 | Phil Cohen | filemerge: extract `_picklabels` as a helper function | changeset | files |
Sun, 13 Aug 2017 22:46:03 -0700 | Phil Cohen | simplemerge: write merge result to the localctx, if passed | changeset | files |
Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | simplemerge: use contexts to read file data from, if passed | changeset | files |
Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | filemerge: pass contexts to simplemerge | changeset | files |
Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | simplemerge: add optional context parameters to simplemerge | changeset | files |
Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | simplemerge: extract verifytext as a helper function | changeset | files |