Now that looks interesting: Sublime Merge, a new git/merge client from makers of Sublime Text. https://www.sublimemerge.com/
@aras
It does look interesting, will have to check it out! I especially like the feature of inspecting file history across renames and moves, have wanted that many times
@aras I was hopeful I could use it to replace p4merge... Need something like kaleidoscope but for windohs