| Thu, 24 Aug 2017 21:26:40 -0700 | Phil Cohen | simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata` | file | diff | annotate |
| Sun, 13 Aug 2017 22:46:16 -0700 | Phil Cohen | filemerge: extract `_picklabels` as a helper function | file | diff | annotate |
| Sun, 13 Aug 2017 22:46:03 -0700 | Phil Cohen | simplemerge: write merge result to the localctx, if passed | file | diff | annotate |
| Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | simplemerge: use contexts to read file data from, if passed | file | diff | annotate |
| Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | simplemerge: add optional context parameters to simplemerge | file | diff | annotate |
| Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | simplemerge: extract verifytext as a helper function | file | diff | annotate |
| Thu, 22 Jun 2017 03:16:16 +0530 | Pulkit Goyal | py3: convert kwargs' keys' to str using pycompat.strkwargs() | file | diff | annotate |