Server IP : 85.193.89.191 / Your IP : 18.222.98.202 Web Server : Apache System : Linux 956367-cx40159.tmweb.ru 3.10.0-1160.105.1.el7.x86_64 #1 SMP Thu Dec 7 15:39:45 UTC 2023 x86_64 User : bitrix ( 600) PHP Version : 8.1.27 Disable Function : NONE MySQL : OFF | cURL : OFF | WGET : ON | Perl : ON | Python : ON | Sudo : ON | Pkexec : ON Directory : /proc/981/cwd/usr/libexec/git-core/mergetools/ |
Upload File : |
diff_cmd () { "$merge_tool_path" -R -f -d \ -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE" } merge_cmd () { touch "$BACKUP" case "$1" in gvimdiff|vimdiff) if $base_present then "$merge_tool_path" -f -d -c 'wincmd J' \ "$MERGED" "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" -f -d -c 'wincmd l' \ "$LOCAL" "$MERGED" "$REMOTE" fi ;; gvimdiff2|vimdiff2) "$merge_tool_path" -f -d -c 'wincmd l' \ "$LOCAL" "$MERGED" "$REMOTE" ;; esac check_unchanged } translate_merge_tool_path() { case "$1" in gvimdiff|gvimdiff2) echo gvim ;; vimdiff|vimdiff2) echo vim ;; esac }