Git Manager 1.2.2

This release makes the merge editor easier to work with on large files: conflicts are easy to find, resolve in place, and the panes stay lined up.

Improvements

See conflicts: conflicts are colored in every pane (ours green, theirs blue, base grey, markers red) and marked on each pane's scrollbar. Lines each side changed from the common ancestor are tinted lightly, and the pane headings name the branches.
Jump between conflicts: ‹ / › or F7 / Shift+F7 move to the previous or next conflict and scroll every pane to it. The editor opens on the first conflict.
Resolve in place: a toolbar at the active conflict offers Accept ours, Accept theirs, Both and Both, theirs first. Each resolution is one Ctrl+Z step and keeps your place. Start over returns the file to Git's merge.
Scroll together: scrolling any pane scrolls the others to the matching lines. Turn it off from the toolbar.
Layout: choose Columns (ours, result, theirs) or Stacked (ours and theirs above a full-width result); the choice is remembered. Base adds the common ancestor as an extra pane.
Files: each conflicted file shows how many conflicts are left, and files saved in this session stay listed with a check. With many files the list moves to a column beside the editors. Save & stage opens the next file.
The merge editor fills nearly the whole window.

The merge result keeps the file's line endings. Editing the result on Windows could previously save an LF file with CRLF line endings.
Switching to another conflicted file with unsaved changes asks first instead of discarding them.