DIFFUSE(1) Diffuse DIFFUSE(1) diffuse - diffuse [-h | -? | --help | -v | --version] diffuse [--no-rcfile | --rcfile file] [[option...] | [file...]...] Diffuse . , . Diffuse Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS Subversion . , . Diffuse . -h, -?, --help . -v, --version . , , . --no-rcfile . --rcfile file file. -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 , . --line line line . --null-file . , , . -b, --ignore-space-change (, ). -B, --ignore-blank-lines , . -E, --ignore-end-of-line (). -i, --ignore-case . -w, --ignore-all-space , . -> 2- -> 3- , . , Diffuse, . Diffuse , . . . , , . . . . , . , . . Shift . , / . Shift / . , . () . () , , . , , Space (), , Space (), . Escape . , . Enter . , , /, (.. , , , ). , , . Shift (.. - Shift - ) -, ome, End / . . . , . . , . scape , . . , Diffuse . , . . , . Diffuse . Microsoft Windows Diffuse Cygwin, . Diffuse Cygwin, , Cygwin Diffuse . Cygwin , Cygwin. . Bash login , Cygwin . -m Diffuse , , () . . , . , : $ diffuse -m , . , 2- foo.C foo.C: $ diffuse foo.C -r , . , , . , ., 2- 123 foo.C foo.C: $ diffuse -r 123 foo.C -r . , 2- 123 foo.C 321 foo.C: $ diffuse -r 123 -r 321 foo.C . , 3- MERGE_HEAD foo.C, foo.C HEAD foo.C: $ diffuse -r MERGE_HEAD foo.C foo.C -r HEAD foo.C -c , . , 2- 1.2.2 foo.C 1.2.3 foo.C: $ diffuse -c 1.2.3 foo.C Diffuse , . Git octopus , : $ diffuse -r HEAD^1 -r HEAD^2 -r HEAD^3 -r HEAD^4 -r HEAD^5 foo.C Diffuse , , , , . Diffuse , /etc/diffuserc (%INSTALL_DIR%\diffuserc Microsoft Windows), ~/.config/diffuse/diffuserc (%HOME%\.config\diffuse\diffuserc Microsoft Windows). --no-rcfile --rcfile. Bourne shell-like ( /) . , , Bourne shell (). import file file. . keybinding context action key_combination action, context. Shift Control, Shift+ Ctrl+ key_combination . , Shift, , key_combination Shift. , Ctrl+g Shift+Ctrl+G. key_combination None action. menu context, . action: open_file -> ... : Ctrl+o open_file_in_new_tab -> ... : Ctrl+t open_modified_files -> ... : Shift+Ctrl+O open_commit -> ... : Shift+Ctrl+T reload_file -> : Shift+Ctrl+R save_file -> : Ctrl+s save_file_as -> ... : Shift+Ctrl+A save_all -> : Shift+Ctrl+S new_2_way_file_merge -> 2- : Ctrl+2 new_3_way_file_merge -> 3- : Ctrl+3 close_tab -> : Ctrl+w undo_close_tab -> : Shift+Ctrl+w quit -> B : Ctrl+q undo -> : Ctrl+z redo -> : Shift+Ctrl+Z cut -> : Ctrl+x copy -> : Ctrl+c paste -> : Ctrl+v select_all -> : Ctrl+a clear_edits -> : Ctrl+r dismiss_all_edits -> : Ctrl+d find -> ... : Ctrl+f find_next -> : Ctrl+g find_previous -> : Shift+Ctrl+G go_to_line -> ... : Shift+Ctrl+L preferences -> ... : no_syntax_highlighting -> -> : syntax_highlighting_syntax -> -> syntax : realign_all -> : Ctrl+l isolate -> : Ctrl+i first_difference -> : Shift+Ctrl+Up previous_difference -> : Ctrl+Up next_difference -> : Ctrl+Down last_difference -> : Shift+Ctrl+Down first_tab -> : Shift+Ctrl+Page_Up previous_tab -> : Ctrl+Page_Up next_tab -> : Ctrl+Page_Down last_tab -> : Shift+Ctrl+Page_Down shift_pane_right -> : Shift+Ctrl+parenleft shift_pane_left -> : Shift+Ctrl+parenright convert_to_upper_case -> : Ctrl+u convert_to_lower_case -> : Shift+Ctrl+U sort_lines_in_ascending_order -> : Ctrl+y sort_lines_in_descending_order -> : Shift+Ctrl+Y remove_trailing_white_space -> : Ctrl+k convert_tabs_to_spaces -> : Ctrl+b convert_leading_spaces_to_tabs -> : Shift+Ctrl+B increase_indenting -> : Shift+Ctrl+greater decrease_indenting -> : Shift+Ctrl+less convert_to_dos -> DOS : Shift+Ctrl+E convert_to_mac -> Ma : Shift+Ctrl+C convert_to_unix -> Uni : Ctrl+e copy_selection_right -> : Shift+Ctrl+Right copy_selection_left -> : Shift+Ctrl+Left copy_left_into_selection -> : Ctrl+Right copy_right_into_selection -> : Ctrl+Left merge_from_left_then_right -> : Ctrl+m merge_from_right_then_left -> : Shift+Ctrl+M help_contents -> ... : F1 about -> Diffuse... : line_mode context, . action: enter_align_mode : space enter_character_mode : Return, KP_Enter first_line : Home, g extend_first_line , : Shift+Home last_line : End, Shift+G extend_last_line , : Shift+End up : Up, k extend_up , : Shift+Up, Shift+K down : Down, j extend_down , : Shift+Down, Shift+J left : Left, h extend_left , : Shift+Left right : Right, l extend_right , : Shift+Right page_up : Page_Up, Ctrl+u extend_page_up , : Shift+Page_Up, Shift+Ctrl+u page_down : Page_Down, Ctrl+d extend_page_down , : Shift+Page_Down, Shift+Ctrl+d delete_text : BackSpace, Delete, x first_difference : Ctrl+Home, Shift+P previous_difference : p next_difference : n last_difference : Ctrl+End, Shift+N clear_edits : r copy_selection_right -> : copy_selection_left -> : copy_left_into_selection : Shift+L copy_right_into_selection : Shift+H merge_from_left_then_right , : m merge_from_right_then_left , : Shift+M isolate : i align_mode context, . action: enter_line_mode : Escape enter_character_mode : Return, KP_Enter first_line : g last_line : Shift+G up : Up, k down : Down, j left : Left, h right : Right, l page_up : Page_Up, Ctrl+u page_down : Page_Down, Ctrl+d align : space character_mode context, . action: enter_line_mode : Escape string name value name value. Diffuse: difference_colours , : difference_1 difference_2 difference_3 [ colour | color ] name red green blue , name. 0 1. Diffuse: alignment , , : 1 1 0 character_selection , : 0.7 0.7 1 cursor , : 0 0 0 difference_1 , : 1 0.625 0.625 difference_2 , : 0.85 0.625 0.775 difference_3 , : 0.85 0.775 0.625 edited , : 0.5 1 0.5 hatch , : 0.8 0.8 0.8 line_number , : 0 0 0 line_number_background : 0.75 0.75 0.75 line_selection , : 0.7 0.7 1 map_background : 0.6 0.6 0.6 margin , : 0.8 0.8 0.8 preedit : 0 0 0 text : 0 0 0 text_background : 1 1 1 float name value , name value. Diffuse: alignment_opacity , : 1 character_difference_opacity , : 0.4 character_selection_opacity , : 0.4 edited_opacity , : 0.4 line_difference_opacity , : 0.3 line_selection_opacity , : 0.4 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. final_state, pattern . , ignorecase. , , . Diffuse: /etc/diffuserc (%INSTALL_DIR%\diffuserc Microsoft Windows) /usr/share/diffuse/syntax/*.syntax (%INSTALL_DIR%\syntax\*.syntax Microsoft Windows) ~/.config/diffuse/diffuserc (%HOME%\.config\diffuse\diffuserc Microsoft Windows) ~/.config/diffuse/prefs (%HOME%\.config\diffuse\prefs Microsoft Windows) ~/.local/share/diffuse/state , (%HOME%\.local\share\diffuse\state Microsoft Windows) Diffuse Derrick Moser . (C) 2006-2014 Derrick Moser. . (diffuse.mo; ru.po): .. Diffuse (); / GNU General Public License, Free Software Foundation; 2 , ( ) . diffuse 0.4.8 2014-07-18 DIFFUSE(1)