Sublime Merge for the win; a fantastic visual interface with context and reversible inputs. Don't leave home without it!