Imediff

• git-ime(1) An interactive git commit split helper tool
• imediff(1) An interactive fullscreen merge tool for 2 or 3 files