add refs to the File struct
keep raw diff
Merge branch 'feature/keep-orig' into develop

Conflicts:
	patch/patch.go