log

age author description
Thu, 07 Dec 2017 13:20:47 -0800 Phil Cohen rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
Thu, 07 Dec 2017 13:20:47 -0800 Phil Cohen rebase: do not bail on uncomitted changes if rebasing in-memory