Update User Guide

[walterwoj]

Not a bug, just a request, can you update the user guide to explain what button does what buy default? IE, what does 'SHIFT' + click do? 'CONTROL' + click? 'SHIFT' + 'CONTROL' + click? I know they do something because I saw it mentioned in the announcement post, but it didn't say what and I would love to know how to 'keep this line', or 'discard this line', without figuring it out the hard way. I love notepad++ and I'm sure i'll love this plugin once I know how to use it.

-WW

[pnedev]

@walterwoj ,

I will update the user guide some time in the future (there are a lot of things that need to be added there) but it is with the lowest priority to me (unpleasant :) and least urgent).
I will briefly explain the functionality you are asking about here:

After compare you have the files with their diffs side by side and each file view has a compare margin -> the place where the + and - signs are. If you just click over one such margin at the line where a change is present the whole diff section containing that line will be selected. The selection in the file view which margin you clicked will remain but the selection in the other file will get automatically deselected after a few seconds. This helps to quickly select a changed block so you can copy it and to show what is the corresponding changed block in the other file.
Now if you hold CTRL key and click again the same line the whole diff section (that was selected) will be 'equalized' meaning the changed section from the other file will be put in place of the diff section where you clicked. This quickly takes one diff block from one file and puts it in the other overwriting the differences.
Now a diff block can contain added or removed lines sub-sections (+ and - signs) and some changed lines in-between (inequality signs). Holding SHIFT key selects only the single changed line in a diff block when you click on its margin or added or removed diff sub-section surrounded by changed lines. This effectively makes it easy (by holding SHIFT+CTRL) to replace only one changed line (taking the corresponding line from the other file) in a diff block or to replace (equalize) only the partial added/removed diff sub-section of a diff block.

Sounds complicated as an explanation but please try playing with it a bit on a test compared files and see how it works.
I'll need to create a short video in the future to better illustrate that but I don't have time right now.

BR

[walterwoj]

Thank you for the explanation, it was very helpful. I do love your plugin and will use it a lot in the future for managing GCode (I'm a CNC programmer)