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: xxdiff

diff_cmd () { "$merge_tool_path" \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ "$LOCAL" "$REMOTE" } merge_cmd () { touch "$BACKUP" if $base_present then "$merge_tool_path" -X --show-merged-pane \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" -X $extra \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$MERGED" "$LOCAL" "$REMOTE" fi check_unchanged }
Save