Create New Item
Item Type
File
Folder
Item Name
Search file in folder and subfolders...
Are you sure want to rename?
File Manager
/
ALFA_DATA
/
alfasymlink
/
root
/
usr
/
libexec
/
git-core
/
mergetools
:
guiffy
Advanced Search
Upload
New Item
Settings
Back
Back Up
Advanced Editor
Save
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use Guiffy's Diff Tool (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -s "$LOCAL" \ "$REMOTE" "$BASE" "$MERGED" else "$merge_tool_path" -m "$LOCAL" \ "$REMOTE" "$MERGED" fi } merge_cmd_help () { echo "Use Guiffy's Diff Tool (requires a graphical session)" } exit_code_trustable () { true }