I usually work on someone else's code base on a remote system and often need to merge code from two different files. For that I have to pull files to my system and meld it and push it back to the remote system. Is there any better way to do it through the terminal itself? (i.e. Terminal and command-line equivalent of Meld Diff Viewer)?