Imediff2 lets you merge two (slightly different) files interactively with a user-friendly fullscreen interface in text mode. It shows the differences of given two files (in color if the terminal supports them), lets you scroll the file, and toggle changes between old and new version one by one. Unlike split screen based merge tools, it shows only one version at a time, making it more WYSIWYG.
