When using ediff, I often get conflicts like this:
<<<<<<< variant A
added_function_1 () {
=======
added_function_2 () {
>>>>>>> variant B
<<<<<<< variant A
body1
=======
body2
>>>>>>> variant B
}
when I expect this:
<<<<<<< variant A
added_function_1 () {
body1...
=======
added_function_2 () {
body2...
>>>>>>> variant B
}
Ediff created two chunks where I expected only one. Is there a way to merge them?
This also happens with smerge-ediff
, it actually splits up the chunks the diff tool generated.
What I actually want is of course
<<<<<<< variant A
added_function_1 () {
body1...
}
=======
added_function_2 () {
body2...
}
>>>>>>> variant B
but I guess that would require semantic diffing.
+ -combine diff regions
feature? – Melioratus Oct 21 '19 at 20:40