0x1949 Team - FAZEMRX - MANAGER

Edit File: 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" }