If you merge files, after you select a contributor to resolve a given difference, you can use edit commands.