If I meet Junio Hamano or Linus Torvalds, I will kiss them for creating Git, but even if I live in the Git CLI client and do a lot of merges, I always felt clumsy when I had to resolve conflicts (what is theirs and ours?)
This simple and free tool has made even this task pain free: