I work a lot with repos with very long line lengths (regularly up to 10k characters) and have to often check and merge multiple changes per line. I really like Git clients that can do one or all of these things:

- Block a small threshold of vertical scrolling when scrolling horizontally on a trackpad to stop the current line I‘m tracking wavering up and down as I scroll.

- Highlight whether there are further changes on the same line in some way (e.g. Git Fork starts a highlight at the first change and stops it at the last).

- Allow some sort of merge comparison with word wrapping turned on (I‘m yet to find a client that does this).

If you can get the first, and one of the second or third in, then I‘ll happily pick up a Sublime Merge licence to go with my Sublime Text one. I do understand that this isn‘t a typical merge environment, but I’m editing ebooks with long paragraphs.