save-file representation for splits and tagging allow merging adjacent hunks that aren't from a split