"GOT", but the "O" is a cute, smiling pufferfish. Index | Search

Thread:
got patch: diff3 merge for git diffs