Refreshing file list in commit dialog loses scroll position

What steps will reproduce the problem?

1. Perform a commit or merge which has a sufficiently large number of files to present a scroll bar.
2. Scroll down to a file a page or two down, and press F5.
3. The scroll jumps back to the top, losing your original position.

The above is only slightly annoying. An alternate method is downright aggravating:

1. Perform a merge or rebase which generates conflicts, and has a sufficiently large number of files to present a scroll bar.
2. Open the Check for Modifications or Commit windows to resolve the conflicts.
3. Scroll down to a conflicted file a page or two down.
4. Resolve the conflict in the file (eg. double-click and then right-click Resolved).
5. The file list reloads and then jumps back to the top, losing your original position (and making you hunt for conflicted files in the list again).

What is the expected output? What do you see instead?

The scroll position should be retained after reloading the list. Ideally the selected file should remain visible even if its position has moved.

It would also be nice if Prev/Next Conflict links were available as with TortoiseSVN, although that's technically a separate feature request.

What version of TortoiseGit and Git are you using? On what operating system?

• TortoiseGit 2.2.0.0
• git 2.9.3.windows.2
• Windows 8.1.1