Hello, I wrote vimdiff3 to leverage both the power of git's diff3 and vim's diff mode, but commit 0041797449 broke that. Here you can see how it used to work: https://i.snipboard.io/hSdfkj.jpg The added and changed lines are properly highlighted. After I fix the conflicts vim still properly highlights which lines were changed, and even what specific characters were modified: https://i.snipboard.io/HvpULI.jpg Now I get absolutely nothing: https://i.snipboard.io/HXMui4.jpg Additionally, every time I run the command I get an annoying message: "./content_LOCAL_8975" 6L, 28B "./content_BASE_8975" 6 lines, 29 bytes "./content_REMOTE_8975" 6 lines, 29 bytes "content" 16 lines, 115 bytes Press ENTER or type command to continue Because that's what `bufdo` does. After discussing v1 with Fernando Ramos I came up with a different route to fix the issues by reorganizing the code first, and after the code is reorganized for the special case of single window mode, it should be clear that the switch to the old vimdiff mode for vimdiff3 is easy and trivial. Felipe Contreras (9): mergetools: vimdiff: fix comment mergetools: vimdiff: shuffle single window case mergetools: vimdiff: add get_buf() helper mergetools: vimdiff: make vimdiff3 actually work mergetools: vimdiff: silence annoying messages mergetools: vimdiff: fix for diffopt mergetools: vimdiff: cleanup cruft mergetools: vimdiff: fix single window mode mergetools: vimdiff: use vimdiff for vimdiff3 mergetools/vimdiff | 74 ++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 36 deletions(-) Range-diff against v1: 1: d0530af49c < -: ---------- mergetools: vimdiff3: make it work as intended 2: 01a229ef5e < -: ---------- mergetools: vimdiff3: fix diffopt options -: ---------- > 1: 20c5abdbc8 mergetools: vimdiff: fix comment -: ---------- > 2: e6c860d2be mergetools: vimdiff: shuffle single window case -: ---------- > 3: bdf1e919a5 mergetools: vimdiff: add get_buf() helper -: ---------- > 4: c5e21e3049 mergetools: vimdiff: make vimdiff3 actually work -: ---------- > 5: 2bf45c882d mergetools: vimdiff: silence annoying messages -: ---------- > 6: 77a67628e7 mergetools: vimdiff: fix for diffopt -: ---------- > 7: adc9d18f2b mergetools: vimdiff: cleanup cruft -: ---------- > 8: fe7fb1a018 mergetools: vimdiff: fix single window mode -: ---------- > 9: 15765aa9d2 mergetools: vimdiff: use vimdiff for vimdiff3 -- 2.37.1.378.g3f95da6bac
