PATH: //proc/self/root/usr/libexec/git-core/mergetools
FILE_BARU
CREATE
FOLDER_BARU
MKDIR
UPLOAD_FILE
GO
[ .. KEMBALI ]
📄 araxis
↓
X
📄 bc
↓
X
📄 codecompare
↓
X
📄 deltawalker
↓
X
📄 diffmerge
↓
X
📄 diffuse
↓
X
📄 ecmerge
↓
X
📄 emerge
↓
X
📄 examdiff
↓
X
📄 guiffy
↓
X
📄 gvimdiff
↓
X
📄 kdiff3
↓
X
📄 kompare
↓
X
📄 meld
↓
X
📄 nvimdiff
↓
X
📄 opendiff
↓
X
📄 smerge
↓
X
📄 tkdiff
↓
X
📄 tortoisemerge
↓
X
📄 vimdiff
↓
X
📄 vscode
↓
X
📄 winmerge
↓
X
📄 xxdiff
↓
X
SAVING...
BERHASIL DIUBAH!
EDITING: kdiff3
diff_cmd () { "$merge_tool_path" \ --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use KDiff3 (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" --auto \ --L1 "$MERGED (Base)" \ --L2 "$MERGED (Local)" \ --L3 "$MERGED (Remote)" \ -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 else "$merge_tool_path" --auto \ --L1 "$MERGED (Local)" \ --L2 "$MERGED (Remote)" \ -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi } merge_cmd_help () { echo "Use KDiff3 (requires a graphical session)" } exit_code_trustable () { true } translate_merge_tool_path() { if type kdiff3 >/dev/null 2>/dev/null then echo kdiff3 else mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3" fi }
SIMPAN PERUBAHAN