log

age author description
Thu, 24 Aug 2017 21:30:51 -0700 Phil Cohen simplemerge: make context parameters non-optional
Thu, 24 Aug 2017 21:30:51 -0700 Phil Cohen simplemerge: stop accepting, and passing, file parameters
Thu, 24 Aug 2017 21:30:37 -0700 Phil Cohen simplemerge: stop reading from, and writing to, files
Thu, 24 Aug 2017 21:30:37 -0700 Phil Cohen simplemerge: use context paths for default labels instead of file paths
Thu, 24 Aug 2017 21:30:37 -0700 Phil Cohen contrib: make simplemerge script pass context-like objects
Thu, 24 Aug 2017 21:26:40 -0700 Phil Cohen simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`
Thu, 24 Aug 2017 21:26:40 -0700 Phil Cohen context: add `decodeddata()` to basefilectx