13 651
правка
Изменения
Добавлена закладка Pinnacle-pctv-hybrid-pro-stick-340e
=== Май 2010 ===
* 25 Май, 16:07:11: [http://www.gkall.nl/pinnacle-pctv-hybrid-pro-stick-340e.html Pinnacle-pctv-hybrid-pro-stick-340e]
* 25 Май, 15:00:46: [http://mercurial.selenic.com/wiki/TipsAndTricks#Using_FileMerge.app.2BAC8-opendiff_as_the_diff_program_.28OS_X.29 TipsAndTricks - Mercurial]
*: <html><H3 id="Using_RCS_merge_as_the_filemerge_program">15. Using RCS merge as the filemerge program</H3> <SPAN class="anchor" id="line-159"></SPAN><P class="line862">The <TT class="backtick">merge</TT> program supplied with <TT class="backtick">RCS</TT> gives more complete conflict markers than the default install if you give it the <TT class="backtick">-A</TT> option. For your <TT class="backtick">.hgrc</TT>: <SPAN class="anchor" id="line-160"></SPAN><SPAN class="anchor" id="line-161"></SPAN></P><P class="line867"><SPAN class="anchor" id="line-162"></SPAN><SPAN class="anchor" id="line-163"></SPAN><SPAN class="anchor" id="line-164"></SPAN><SPAN class="anchor" id="line-165"></SPAN></P><PRE>[merge-tools] filemerge.executable = /usr/bin/merge filemerge.args = -A $local $base $other</PRE><SPAN class="anchor" id="line-166"></SPAN><P class="line862">See also <A href="http://mercurial.selenic.com/wiki/MergingManuallyInEditor">MergingManuallyInEditor</A>.</P></html>
