Differences
This shows you the differences between the selected revisions of the page.
2014-01-27 | 2014-01-31 | ||
Restored revision 1386663103. Undoing revision 1390800391. (martin) (hidden) | Add File Compare section - WinMerge (cozappz) | ||
Line 116: | Line 116: | ||
* Connect at least once from an interactive terminal (such as [[&url(putty)|PuTTY SSH client]]) to verify the destination server host key. | * Connect at least once from an interactive terminal (such as [[&url(putty)|PuTTY SSH client]]) to verify the destination server host key. | ||
* Use for example [[ui_login_authentication#forwarding|Agent forwarding]] to forward your private key to the destination server for authentication. | * Use for example [[ui_login_authentication#forwarding|Agent forwarding]] to forward your private key to the destination server for authentication. | ||
+ | |||
+ | ===== [[compare]] File Compare ===== | ||
+ | |||
+ | ==== WinMerge ==== | ||
+ | |||
+ | "C:\Program Files (x86)\WinMerge\WinMergeU.exe" /e /x /u "!" "!^!" | ||
+ | |||
+ | Where | ||
+ | * /e enables you to close WinMerge with a single Esc key press | ||
+ | * /x closes WinMerge (after displaying an information dialog) when you start a comparison of identical files | ||
+ | * /u prevents WinMerge from adding either path (left or right) to the Most Recently Used (MRU) list | ||
+ | |||