redo/simplify the timeline display and sort the file list better
merge a patch with its parent by rebasing the other siblings