Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/kdiff3_shell.rc @ 66:efe33e938730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
0.9.86
author joachim99
date Thu, 16 Sep 2004 02:40:08 +0000
parents 8af4bb9d9a5a
children 8febbfb1148c
comparison
equal deleted inserted replaced
65:8ea11c8efeb5 66:efe33e938730
45 <Action name="go_prev_conflict"/> 45 <Action name="go_prev_conflict"/>
46 <Action name="go_next_conflict"/> 46 <Action name="go_next_conflict"/>
47 <Action name="go_prev_unsolved_conflict"/> 47 <Action name="go_prev_unsolved_conflict"/>
48 <Action name="go_next_unsolved_conflict"/> 48 <Action name="go_next_unsolved_conflict"/>
49 </Menu> 49 </Menu>
50 <Menu name="diff"><text>D&amp;iffview</text>
51 <Action name="diff_showlinenumbers"/>
52 <Action name="diff_show_whitespace_characters"/>
53 <Action name="diff_show_whitespace"/>
54 <Action name="diff_overview_normal"/>
55 <Action name="diff_overview_ab"/>
56 <Action name="diff_overview_ac"/>
57 <Action name="diff_overview_bc"/>
58 <Action name="diff_wordwrap"/>
59 </Menu>
50 <Menu name="merge"><text>&amp;Merge</text> 60 <Menu name="merge"><text>&amp;Merge</text>
51 <Action name="merge_current"/> 61 <Action name="merge_current"/>
52 <Action name="merge_choose_a"/> 62 <Action name="merge_choose_a"/>
53 <Action name="merge_choose_b"/> 63 <Action name="merge_choose_b"/>
54 <Action name="merge_choose_c"/> 64 <Action name="merge_choose_c"/>
62 <Action name="merge_choose_a_for_unsolved_whitespace_conflicts"/> 72 <Action name="merge_choose_a_for_unsolved_whitespace_conflicts"/>
63 <Action name="merge_choose_b_for_unsolved_whitespace_conflicts"/> 73 <Action name="merge_choose_b_for_unsolved_whitespace_conflicts"/>
64 <Action name="merge_choose_c_for_unsolved_whitespace_conflicts"/> 74 <Action name="merge_choose_c_for_unsolved_whitespace_conflicts"/>
65 <Action name="merge_autosolve"/> 75 <Action name="merge_autosolve"/>
66 <Action name="merge_autounsolve"/> 76 <Action name="merge_autounsolve"/>
67 <Action name="merge_showlinenumbers"/>
68 <Action name="merge_show_whitespace_characters"/>
69 <Action name="merge_show_whitespace"/>
70 </Menu> 77 </Menu>
71 <Menu name="window"><text>&amp;Window</text> 78 <Menu name="window"><text>&amp;Window</text>
72 <Action name="win_focus_prev"/> 79 <Action name="win_focus_prev"/>
73 <Action name="win_focus_next"/> 80 <Action name="win_focus_next"/>
74 <Action name="win_show_a"/> 81 <Action name="win_show_a"/>
92 <Action name="go_next_unsolved_conflict"/> 99 <Action name="go_next_unsolved_conflict"/>
93 <Action name="merge_choose_a"/> 100 <Action name="merge_choose_a"/>
94 <Action name="merge_choose_b"/> 101 <Action name="merge_choose_b"/>
95 <Action name="merge_choose_c"/> 102 <Action name="merge_choose_c"/>
96 <Action name="merge_autoadvance"/> 103 <Action name="merge_autoadvance"/>
97 <Action name="merge_show_whitespace"/> 104 <Action name="diff_show_whitespace"/>
98 <Action name="merge_show_whitespace_characters"/> 105 <Action name="diff_show_whitespace_characters"/>
99 <Action name="merge_showlinenumbers"/> 106 <Action name="diff_showlinenumbers"/>
100 </ToolBar> 107 </ToolBar>
101 </kpartgui> 108 </kpartgui>