Andrew's git / gitweb.git / mergetools/ecmerge
?
mergetools / ecmergeon commit Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' (634392b)
   1diff_cmd () {
   2        "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
   3}
   4
   5merge_cmd () {
   6        touch "$BACKUP"
   7        if $base_present
   8        then
   9                "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
  10                        --default --mode=merge3 --to="$MERGED"
  11        else
  12                "$merge_tool_path" "$LOCAL" "$REMOTE" \
  13                        --default --mode=merge2 --to="$MERGED"
  14        fi
  15        check_unchanged
  16}