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: tortoisemerge
can_diff () { return 1 } diff_cmd_help () { echo "Use TortoiseMerge (requires a graphical session)" } merge_cmd () { if $base_present then basename="$(basename "$merge_tool_path" .exe)" if test "$basename" = "tortoisegitmerge" then "$merge_tool_path" \ -base "$BASE" -mine "$LOCAL" \ -theirs "$REMOTE" -merged "$MERGED" else "$merge_tool_path" \ -base:"$BASE" -mine:"$LOCAL" \ -theirs:"$REMOTE" -merged:"$MERGED" fi else echo "$merge_tool_path cannot be used without a base" 1>&2 return 1 fi } translate_merge_tool_path() { if type tortoisegitmerge >/dev/null 2>/dev/null then echo tortoisegitmerge else echo tortoisemerge fi } merge_cmd_help () { echo "Use TortoiseMerge (requires a graphical session)" }
SIMPAN PERUBAHAN