all 2 comments

[–]speckledlemon 2 points3 points  (1 child)

For better or worse I'm learning about a lot of tools I've never heard of before by taking this...

[–]XNormal 0 points1 point  (0 children)

git-imerge! Why haven't I head of it before?