gdiff - Command line graphical file difference
me "@gdiff" "version1" "version2"
MicroEmacs may be executed from the command line to invoke the Graphical Difference gdiff(3) macro, showing the difference(s) between two files.
The editor is invoked in gdiff mode and shows the difference between the two files on the command line. The two files are presented side by side and the lines are matched together, the windows are effectively locked together, scrolling one window causes the other window to scroll.
The changes are shown as color coded regions of highlighted text. Each block (or line) has to be accepted or rejected by the user, when all blocks have been accepted then the buffer may be written out merging the changes from both files depending on the accept/reject status. Blocks which have been accepted are typically shown in green, the rejected lines are shown in red.
The keyboard mapping in gdiff mode is defined as follows:
The macro is defined in file gdiff.emf.
Copyright (c) 1998-2006 JASSPA
Last Modified: 2006/08/20
Generated On: 2006/10/07