Andrew's git / gitweb.git / mergetools/tkdiff
?
mergetools / tkdiffon commit t6036: add a failed conflict detection case with symlink modify/modify (c6d3dd5)
   1diff_cmd () {
   2        "$merge_tool_path" "$LOCAL" "$REMOTE"
   3}
   4
   5merge_cmd () {
   6        if $base_present
   7        then
   8                "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
   9        else
  10                "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
  11        fi
  12}
  13
  14exit_code_trustable () {
  15        true
  16}