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

diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { # Adding $(pwd)/ in front of $MERGED should not be necessary. # However without it, DeltaWalker (at least v1.9.8 on Windows) # crashes with a JRE exception. The DeltaWalker user manual, # shows $(pwd)/ whenever the '-merged' options is given. # Adding it here seems to work around the problem. if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED" fi >/dev/null 2>&1 } translate_merge_tool_path() { echo DeltaWalker }
Save