log

age author description
Fri, 13 Oct 2017 12:54:46 -0700 Phil Cohen context: add is `isinmemory()` to filectx
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: ensure that we always commit the mergestate
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: add tests to show current behavior on failed filemerges