Junio C Hamano <gitster@xxxxxxxxx> writes: > Glen Choo <chooglen@xxxxxxxxxx> writes: > >> "Glen Choo via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: >> >>> Note to Junio: 8/8 (which renames "cs" -> "set") conflicts with >>> ab/config-multi-and-nonbool. I previously said that I'd rebase this, but >>> presumably a remerge-diff is more ergonomic + flexible (let me know if I'm >>> mistaken), so I'll send a remerge-diff in a reply (I don't trust GGG not to >>> mangle the patch :/). > > A patch that is indented by two places would not be mechanically > applicable anyway and even without such indentation, the hunk-side > markers like c000d91638, gitster/ab/config-multi-and-nonbool, etc. > you have in the patch would be different from conflicts I would see, > so it wouldn't be very useful. There should probably be a mode > where remerge-diff would omit these labels to help mechanical > application of such a "patch". Ah, bummer :( I was thinking about that as well. remerge-diff actually outputs left and right in "--format=reference", which I then manually modified to reflect the conflicted version in the working tree, giving the final result here. I wonder what remerge-diff or "git apply" could do instead.
