Skip to content
Snippets Groups Projects
Select Git revision
  • 89f80d72c19a48992b5c4a151fb47a365668c153
  • master default
2 results

tkdiff

Blame
  • tkdiff 224 B
    diff_cmd () {
    	"$merge_tool_path" "$LOCAL" "$REMOTE"
    }
    
    merge_cmd () {
    	if $base_present
    	then
    		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
    	else
    		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
    	fi
    }