BLACKSITE
:
216.73.217.4
:
104.37.75.190 / alpenpass.ca
:
Linux server3.pointsplan.com 5.14.0-503.38.1.el9_5.x86_64 #1 SMP PREEMPT_DYNAMIC Fri Apr 18 08:52:10 EDT 2025 x86_64
:
/
usr
/
share
/
doc
/
git
/
Upload File:
files >> //usr/share/doc/git/mergetools-diff.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) `kdiff3`;; Use KDiff3 (requires a graphical session) `kompare`;; Use Kompare (requires a graphical session) `meld`;; Use Meld (requires a graphical session) `nvimdiff`;; Use Neovim `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) `vimdiff`;; Use Vim `vscode`;; Use Visual Studio Code (requires a graphical session) `winmerge`;; Use WinMerge (requires a graphical session) `xxdiff`;; Use xxdiff (requires a graphical session)