DiffMergeSettings DiffMergeSettings 0 0 260 308 DiffMergeSettings unnamed kcfg_diff_ignore_content Diff ignores content type kcfg_tree_diff_rec Diff in revisiontree is recursive kcfg_diff_ignore_spaces Diff ignores white space changes kcfg_diff_ignore_all_white_spaces Diff ignores all white spaces kcfg_use_external_diff Use external diff display If tdesvn should use an external diff display and/or generator. If not checked use internal display. kcfg_extern_merge_default Prefer external merge program Set if merge with external program is prefered and not subversions merge tqlayout2 unnamed m_extern_hint see "Whats this" for details WordBreak|AlignCenter tqlayout2 unnamed resolveLabel Conflict resolver program: AlignVCenter|AlignRight textLabel1 External merge program: AlignVCenter|AlignRight kcfg_conflict_resolver Setup an external program for conflict resolving Enter how tdesvn should call the conflict resolver program. The form is <tt><program> <programoptions></tt> Programoption may contain the place holders for substituting with filenames. The substitutions means: <tt>%o</tt> Old version <tt>%m</tt> Mine or local edit version <tt>%n</tt> Newest version <tt>%t</tt> The target to save as, tdesvn will use the orignal file name for it. Default: <tt>kdiff3 %o %m %n -o %t</tt> mdiff_display_label External diff display: AlignVCenter|AlignRight kcfg_external_merge_program Setup an external program for merging Enter how tdesvn should call the external merge program. The form is <tt><program> <programoptions> %s1 %s2 %t</tt> The substitutions means: <tt>%s1</tt> Source one for merge <tt>%s2</tt> Source two for merge, if it was not set equal to source one but other revision <tt>%t</tt> Local target for merge. kcfg_external_diff_display Enter an external program in form <tt><program> <param> %f</tt> or <tt><program> <param></tt> or <tt><program> <param> %1 %2</tt> If using first or second form, svn itself will generate the diff. %f will replaced with a temporary filename. If %f is not given, the diff-display should able reading data from stdin. When %1 and %2 is given, tdesvn let this display make the diff. For that it it makes a temporary export or get (if needed) and fill out the parameters with the right value. %1 will filled with the content of start-revision, %2 with the endrevision. On large recoursive diffs this may get real slow! spacer3 Vertical Expanding 20 16 kcfg_use_external_diff toggled(bool) DiffMergeSettings diffDispChanged(bool) diffDispChanged(bool) klineedit.h klineedit.h klineedit.h