Navigation And Editing

Much navigation will be done with the scroll bars and the mouse but you can also navigate with the keys. If you click into either window then you can use the shortcuts Left, Right, Up, Down, PgUp, PgDn, Home, End, Ctrl+Home and Ctrl+End as you would in other programs. The overview-column next to the vertical scroll bar of the input files can also be used for navigating by clicking into it.

You can also use the wheel mouse to scroll up and down.

In the merge output editor you can also use the other keys for editing. You can toggle between insert and overwrite mode with the Ins key. (Default is insert-mode.)

A click with the left mouse button into any summary column will synchronise all windows to show the beginning of the same group of lines (as explained in section Setting The Current Group And Synchronising Merge And Diff View Position).

The Button bar also contains nine navigation buttons with which you can jump to the current/first/last difference, to the previous/next difference (Ctrl+Down/Ctrl+Up), to the previous/next conflict (Ctrl+PgDn/Ctrl+PgUp), or to the previous/next unsolved conflict. Note that for KDiff3 a "conflict" that was not automatically solved at the start of the merge stays a "conflict" even if it is solved. Hence the necessity to distinguish "unsolved conflicts".

Auto-Advance

There also is a button Automatically Go to Next Unsolved Conflict After Source Selection (Auto-Advance). If you enable this, then, when one source is selected, KDiff3 will jump to and select the next unsolved conflict automatically. This can help when you always want to choose one source only. When you need both sources, or you want to edit after selecting, then you probably want to switch this off. Before proceeding to the next unsolved conflict KDiff3 shows you the effect of your choice for a short time. This delay is adjustable in the Merge item in the settings dialog: You can specify the Auto advance delay (ms): in milli seconds between 0 and 2000. Hint: Tired of many clicks? - Use a small Auto-Advance-delay and the shortcuts Ctrl+1/2/3 to select A/B/C for many conflicts.