DIFFUSE(1) Diffuse Manual DIFFUSE(1) (NAME) diffuse - (SYNOPSIS) diffuse [-h | -? | --help | -v | --version] diffuse [--no-rcfile | --rcfile file] [[option...] | [file...]...] (DESCRIPTION) Diffuse . Diffuse . Diffuse Bazaar CVS Darcs Git Mercurial Monotone RCS Subversion . (OPTIONS) (Help Options) . Diffuse . -h, -?, --help . -v, --version . (Configuration Options) . --no-rcfile . --rcfile file file . (General Options) -c, --commit rev rev . -D, --close-if-same . -e, --encoding codec codec . -L, --label label label . -m, --modified . -r, --revision rev rev . -s, --separate . -t, --tab . -V, --vcs vcs-list : vcs-list. --line line line. --null-file (pane) . (Display Options) . -b, --ignore-space-change (white space). -B, --ignore-blank-lines . -E, --ignore-end-of-line . -i, --ignore-case . -w, --ignore-all-space . (FILE COMPARISON) File -> New 2-Way File Merge File -> New 3-Way File Merge File -> New N-Way File Merge . Diffuse Open File . Diffuse (gap) . . (Comparison Summary) . . . . . (Selecting) . . (drag ). Shift . Page Up/Down . Shift Page Up/Down . . (Matching Lines) . Align with Selection . (Space) . Escape . Isolate . (Editing) Enter . . . Shift Home End Page Up/Down . . . . . Undo Redo . Escape . (Merging) . Diffuse . . Undo Redo . Clear Edits . (VERSION CONTROL) Diffuse . Diffuse Cygwin . Diffuse Cygwin Cygwin Diffuse . Update paths for Cygwin Cygwin . (PATH) . Launch from a Bash login shell Cygwin . (Viewing Uncommitted Modifications) -m Diffuse () . . . : $ diffuse -m . - foo.C foo.C : $ diffuse foo.C (Specifying Revisions) -r . . . - 123 foo.C foo.C : $ diffuse -r 123 foo.C -r . - 123 foo.C 321 foo.C : $ diffuse -r 123 -r 321 foo.C . - MERGE_HEAD foo.C foo.C HEAD foo.C : $ diffuse -r MERGE_HEAD foo.C foo.C -r HEAD foo.C -c . - 1.2.2 foo.C 1.2.3 foo.C : $ diffuse -c 1.2.3 foo.C Diffuse . (octopus merge) : $ diffuse -r HEAD^1 -r HEAD^2 -r HEAD^3 -r HEAD^4 -r HEAD^5 foo.C (RESOURCES) Diffuse . Diffuse /etc/diffuserc (%INSTALL_DIR%\diffuserc ) ~/.config/diffuse/diffuserc (%HOME%\.config\diffuse\diffuserc ) . --no-rcfile --rcfile . Bourne shell . () Bourne shell . (General) import file file . . (Key Bindings) keybinding context action key_combination action context . Shift Control Shift+ Ctrl+ key_combination . Shift key_combination Shift : Ctrl+g Shift+Ctrl+G. None action key_combination . (Menu Item Key Bindings) menu context . action : open_file File -> Open File... Default: Ctrl+o open_file_in_new_tab File -> Open File In New Tab... Default: Ctrl+t open_modified_files File -> Open Modified Files... Default: Shift+Ctrl+O open_commit File -> Open Commit... Default: Shift+Ctrl+T reload_file File -> Reload File Default: Shift+Ctrl+R save_file File -> Save File Default: Ctrl+s save_file_as File -> Save File As... Default: Shift+Ctrl+A save_all File -> Save All Default: Shift+Ctrl+S new_2_way_file_merge File -> New 2-Way File Merge Default: Ctrl+2 new_3_way_file_merge File -> New 3-Way File Merge Default: Ctrl+3 new_n_way_file_merge File -> New N-Way File Merge Default: Ctrl+4 close_tab File -> Close Tab Default: Ctrl+w undo_close_tab File -> Undo Close Tab Default: Shift+Ctrl+w quit File -> Quit Default: Ctrl+q undo Edit -> Undo Default: Ctrl+z redo Edit -> Redo Default: Shift+Ctrl+Z cut Edit -> Cut Default: Ctrl+x copy Edit -> Copy Default: Ctrl+c paste Edit -> Paste Default: Ctrl+v select_all Edit -> Select All Default: Ctrl+a clear_edits Edit -> Clear Edits Default: Ctrl+r dismiss_all_edits Edit -> Dismiss All Edits Default: Ctrl+d find Edit -> Find... Default: Ctrl+f find_next Edit -> Find Next Default: Ctrl+g find_previous Edit -> Find Previous Default: Shift+Ctrl+G go_to_line Edit -> Go To Line... Default: Shift+Ctrl+L preferences Edit -> Preferences Default: None no_syntax_highlighting View -> Syntax Highlighting -> None Default: None syntax_highlighting_syntax View -> Syntax Highlighting -> syntax Default: None realign_all View -> Realign All Default: Ctrl+l isolate View -> Isolate Default: Ctrl+i first_difference View -> First Difference Default: Shift+Ctrl+Up previous_difference View -> Previous Difference Default: Ctrl+Up next_difference View -> Next Difference Default: Ctrl+Down last_difference View -> Last Difference Default: Shift+Ctrl+Down first_tab View -> First Tab Default: Shift+Ctrl+Page_Up previous_tab View -> Previous Tab Default: Ctrl+Page_Up next_tab View -> Next Tab Default: Ctrl+Page_Down last_tab View -> Last Tab Default: Shift+Ctrl+Page_Down shift_pane_right View -> Shift Pane Right Default: Shift+Ctrl+parenleft shift_pane_left View -> Shift Pane Left Default: Shift+Ctrl+parenright convert_to_upper_case Format -> Convert To Upper Case Default: Ctrl+u convert_to_lower_case Format -> Convert To Lower Case Default: Shift+Ctrl+U sort_lines_in_ascending_order Format -> Sort Lines In Ascending Order Default: Ctrl+y sort_lines_in_descending_order Format -> Sort Lines In Descending Order Default: Shift+Ctrl+Y remove_trailing_white_space Format -> Remove Trailing White Space Default: Ctrl+k convert_tabs_to_spaces Format -> Convert Tabs To Spaces Default: Ctrl+b convert_leading_spaces_to_tabs Format -> Convert Leading Spaces To Tabs Default: Shift+Ctrl+B increase_indenting Format -> Increase Indenting Default: Shift+Ctrl+greater decrease_indenting Format -> Decrease Indenting Default: Shift+Ctrl+less convert_to_dos Format -> Convert To DOS Format Default: Shift+Ctrl+E convert_to_mac Format -> Convert To Mac Format Default: Shift+Ctrl+C convert_to_unix Format -> Convert To Unix Format Default: Ctrl+e copy_selection_right Merge -> Copy Selection Right Default: Shift+Ctrl+Right copy_selection_left Merge -> Copy Selection Left Default: Shift+Ctrl+Left copy_left_into_selection Merge -> Copy Left Into Selection Default: Ctrl+Right copy_right_into_selection Merge -> Copy Right Into Selection Default: Ctrl+Left merge_from_left_then_right Merge -> Merge From Left Then Right Default: Ctrl+m merge_from_right_then_left Merge -> Merge From Right Then Left Default: Shift+Ctrl+M help_contents Help -> Help Contents Default: F1 about Help -> About Default: None (Line Editing Mode Key Bindings) line_mode context . action : enter_align_mode Default: space enter_character_mode Defaults: Return, KP_Enter first_line Defaults: Home, g extend_first_line Default: Shift+Home last_line Defaults: End, Shift+G extend_last_line Default: Shift+End up Defaults: Up, k extend_up Defaults: Shift+Up, Shift+K down Defaults: Down, j extend_down Defaults: Shift+Down, Shift+J left Defaults: Left, h extend_left Default: Shift+Left right Defaults: Right, l extend_right Default: Shift+Right page_up Defaults: Page_Up, Ctrl+u extend_page_up Defaults: Shift+Page_Up, Shift+Ctrl+u page_down Defaults: Page_Down, Ctrl+d extend_page_down Defaults: Shift+Page_Down, Shift+Ctrl+d delete_text Defaults: BackSpace, Delete, x first_difference Defaults: Ctrl+Home, Shift+P previous_difference Default: p next_difference Default: n last_difference Defaults: Ctrl+End, Shift+N clear_edits Default: r copy_selection_left Default: None copy_selection_right Default: None copy_left_into_selection Default: Shift+L copy_right_into_selection Default: Shift+H merge_from_left_then_right Default: m merge_from_right_then_left Default: Shift+M isolate Default: i (Alignment Editing Mode Key Bindings) align_mode context . action : enter_line_mode Default: Escape enter_character_mode Defaults: Return, KP_Enter first_line Default: g last_line Default: Shift+G up Defaults: Up, k down Defaults: Down, j left Defaults: Left, h right Defaults: Right, l page_up Defaults: Page_Up, Ctrl+u page_down Defaults: Page_Down, Ctrl+d align Default: space (Character Editing Mode Key Bindings) character_mode context . action : enter_line_mode Default: Escape (Strings) string name value name value . (Used String Resources) Diffuse : difference_colours Default: difference_1 difference_2 difference_3 (Colours) [ colour | color ] name red green blue name . 0 1 . (Used Colour Resources) Diffuse : alignment Default: 1 1 0 character_selection Default: 0.7 0.7 1 cursor Default: 0 0 0 difference_1 Default: 1 0.625 0.625 difference_2 Default: 0.85 0.625 0.775 difference_3 Default: 0.85 0.775 0.625 edited Default: 0.5 1 0.5 hatch Default: 0.8 0.8 0.8 line_number Default: 0 0 0 line_number_background Default: 0.75 0.75 0.75 line_selection Default: 0.7 0.7 1 map_background ( ) Default: 0.6 0.6 0.6 margin Default: 0.8 0.8 0.8 preedit Default: 0 0 0 text Default: 0 0 0 text_background Default: 1 1 1 (Floating Point Values) float name value name value . (Used Floating Point Resources) Diffuse : alignment_opacity Defaults: 1 character_difference_opacity Defaults: 0.4 character_selection_opacity Defaults: 0.4 edited_opacity Defaults: 0.4 line_difference_opacity Defaults: 0.3 line_selection_opacity Defaults: 0.4 (Syntax Highlighting) syntax name [initial_state default_tag] name . . initial_state . default_tag . name initial_state default_tag . syntax_files name [pattern] pattern name . name pattern . syntax_magic name [pattern [ignorecase]] pattern name . name pattern . syntax_pattern name initial_state final_state tag pattern [ignorecase] . . initial_state . pattern final_state . ignorecase . tag . (FILES) Diffuse : /etc/diffuserc (%INSTALL_DIR%\diffuserc ) /usr/share/diffuse/syntax/*.syntax (%INSTALL_DIR%\syntax\*.syntax ) ~/.config/diffuse/diffuserc (%HOME%\.config\diffuse\diffuserc ) ~/.config/diffuse/prefs (%HOME%\.config\diffuse\prefs ) ~/.local/share/diffuse/state (%HOME%\.local\share\diffuse\state ) (AUTHOR) Diffuse Derrick Moser . (C) 2006-2014 Derrick Moser. . (COPYING) Diffuse GNU General Public License (Free Software Foundation) / 2 ( ) . diffuse 0.4.8 2014-07-18 DIFFUSE(1)