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