JFIF$        dd7 

Viewing File: /usr/share/doc/git/mergetools-merge.txt

`araxis`;;           Use Araxis Merge (requires a graphical session)
`bc`;;               Use Beyond Compare (requires a graphical session)
`bc3`;;              Use Beyond Compare (requires a graphical session)
`bc4`;;              Use Beyond Compare (requires a graphical session)
`codecompare`;;      Use Code Compare (requires a graphical session)
`deltawalker`;;      Use DeltaWalker (requires a graphical session)
`diffmerge`;;        Use DiffMerge (requires a graphical session)
`diffuse`;;          Use Diffuse (requires a graphical session)
`ecmerge`;;          Use ECMerge (requires a graphical session)
`emerge`;;           Use Emacs' Emerge
`examdiff`;;         Use ExamDiff Pro (requires a graphical session)
`guiffy`;;           Use Guiffy's Diff Tool (requires a graphical session)
`gvimdiff`;;         Use gVim (requires a graphical session) with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
`gvimdiff1`;;        Use gVim (requires a graphical session) with a 2 panes layout (LOCAL and REMOTE)
`gvimdiff2`;;        Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
`gvimdiff3`;;        Use gVim (requires a graphical session) where only the MERGED file is shown
`kdiff3`;;           Use KDiff3 (requires a graphical session)
`meld`;;             Use Meld (requires a graphical session) with optional `auto merge` (see `git help mergetool`'s `CONFIGURATION` section)
`nvimdiff`;;         Use Neovim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
`nvimdiff1`;;        Use Neovim with a 2 panes layout (LOCAL and REMOTE)
`nvimdiff2`;;        Use Neovim with a 3 panes layout (LOCAL, MERGED and REMOTE)
`nvimdiff3`;;        Use Neovim where only the MERGED file is shown
`opendiff`;;         Use FileMerge (requires a graphical session)
`p4merge`;;          Use HelixCore P4Merge (requires a graphical session)
`smerge`;;           Use Sublime Merge (requires a graphical session)
`tkdiff`;;           Use TkDiff (requires a graphical session)
`tortoisemerge`;;    Use TortoiseMerge (requires a graphical session)
`vimdiff`;;          Use Vim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
`vimdiff1`;;         Use Vim with a 2 panes layout (LOCAL and REMOTE)
`vimdiff2`;;         Use Vim with a 3 panes layout (LOCAL, MERGED and REMOTE)
`vimdiff3`;;         Use Vim where only the MERGED file is shown
`vscode`;;           Use Visual Studio Code (requires a graphical session)
`winmerge`;;         Use WinMerge (requires a graphical session)
`xxdiff`;;           Use xxdiff (requires a graphical session)
Back to Directory  nL+D550H?Mx ,D"v]qv;6*Zqn)ZP0!1 A "#a$2Qr D8 a Ri[f\mIykIw0cuFcRı?lO7к_f˓[C$殷WF<_W ԣsKcëIzyQy/_LKℂ;C",pFA:/]=H  ~,ls/9ć:[=/#f;)x{ٛEQ )~ =𘙲r*2~ a _V=' kumFD}KYYC)({ *g&f`툪ry`=^cJ.I](*`wq1dđ#̩͑0;H]u搂@:~וKL Nsh}OIR*8:2 !lDJVo(3=M(zȰ+i*NAr6KnSl)!JJӁ* %݉?|D}d5:eP0R;{$X'xF@.ÊB {,WJuQɲRI;9QE琯62fT.DUJ;*cP A\ILNj!J۱+O\͔]ޒS߼Jȧc%ANolՎprULZԛerE2=XDXgVQeӓk yP7U*omQIs,K`)6\G3t?pgjrmۛجwluGtfh9uyP0D;Uڽ"OXlif$)&|ML0Zrm1[HXPlPR0'G=i2N+0e2]]9VTPO׮7h(F*癈'=QVZDF,d߬~TX G[`le69CR(!S2!P <0x<!1AQ "Raq02Br#SCTb ?Ζ"]mH5WR7k.ۛ!}Q~+yԏz|@T20S~Kek *zFf^2X*(@8r?CIuI|֓>^ExLgNUY+{.RѪ τV׸YTD I62'8Y27'\TP.6d&˦@Vqi|8-OΕ]ʔ U=TL8=;6c| !qfF3aů&~$l}'NWUs$Uk^SV:U# 6w++s&r+nڐ{@29 gL u"TÙM=6(^"7r}=6YݾlCuhquympǦ GjhsǜNlɻ}o7#S6aw4!OSrD57%|?x>L |/nD6?/8w#[)L7+6〼T ATg!%5MmZ/c-{1_Je"|^$'O&ޱմTrb$w)R$& N1EtdU3Uȉ1pM"N*(DNyd96.(jQ)X 5cQɎMyW?Q*!R>6=7)Xj5`J]e8%t!+'!1Q5 !1 AQaqё#2"0BRb?Gt^## .llQT $v,,m㵜5ubV =sY+@d{N! dnO<.-B;_wJt6;QJd.Qc%p{ 1,sNDdFHI0ГoXшe黅XۢF:)[FGXƹ/w_cMeD,ʡcc.WDtA$j@:) -# u c1<@ۗ9F)KJ-hpP]_x[qBlbpʖw q"LFGdƶ*s+ډ_Zc"?%t[IP 6J]#=ɺVvvCGsGh1 >)6|ey?Lӣm,4GWUi`]uJVoVDG< SB6ϏQ@ TiUlyOU0kfV~~}SZ@*WUUi##; s/[=!7}"WN]'(L! ~y5g9T̅JkbM' +s:S +B)v@Mj e Cf jE 0Y\QnzG1д~Wo{T9?`Rmyhsy3!HAD]mc1~2LSu7xT;j$`}4->L#vzŏILS ֭T{rjGKC;bpU=-`BsK.SFw4Mq]ZdHS0)tLg