Andrew's git / gitweb.git / mergetools/tortoisemerge
?
mergetools / tortoisemergeon commit Make 'git submodule update --force' always check out submodules. (01d4721)
   1can_diff () {
   2        return 1
   3}
   4
   5merge_cmd () {
   6        if $base_present
   7        then
   8                touch "$BACKUP"
   9                "$merge_tool_path" \
  10                        -base:"$BASE" -mine:"$LOCAL" \
  11                        -theirs:"$REMOTE" -merged:"$MERGED"
  12                check_unchanged
  13        else
  14                echo "TortoiseMerge cannot be used without a base" 1>&2
  15                return 1
  16        fi
  17}