log

age author description
Fri, 19 Jan 2018 18:52:50 -0800 Kyle Lippincott filemerge: give some variables in _xmerge more descriptive names
Thu, 15 Mar 2018 13:19:55 -0700 Martin von Zweigbergk rebase: allow in-memory merge of the working copy parent
Sat, 17 Mar 2018 09:33:17 -0700 Martin von Zweigbergk uncommit: simplify condition for keeping commit