Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/kdiff3_shell.rc @ 58:8af4bb9d9a5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Version 0.9.83
author joachim99
date Sun, 07 Mar 2004 09:59:09 +0000
parents c59d5a3a8ff3
children efe33e938730
comparison
equal deleted inserted replaced
57:023fbd76c1e3 58:8af4bb9d9a5a
92 <Action name="go_next_unsolved_conflict"/> 92 <Action name="go_next_unsolved_conflict"/>
93 <Action name="merge_choose_a"/> 93 <Action name="merge_choose_a"/>
94 <Action name="merge_choose_b"/> 94 <Action name="merge_choose_b"/>
95 <Action name="merge_choose_c"/> 95 <Action name="merge_choose_c"/>
96 <Action name="merge_autoadvance"/> 96 <Action name="merge_autoadvance"/>
97 <Action name="merge_show_whitespace"/>
97 <Action name="merge_show_whitespace_characters"/> 98 <Action name="merge_show_whitespace_characters"/>
98 <Action name="merge_showlinenumbers"/> 99 <Action name="merge_showlinenumbers"/>
99 </ToolBar> 100 </ToolBar>
100 </kpartgui> 101 </kpartgui>