%PDF- %PDF-
Direktori : /var/www/html/friendstravel.al/wp-content/uploads/k2/root/usr/lib/git-core/mergetools/ |
Current File : /var/www/html/friendstravel.al/wp-content/uploads/k2/root/usr/lib/git-core/mergetools/examdiff |
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" -nh } merge_cmd () { if $base_present then "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh else "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh fi } translate_merge_tool_path() { mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" }