freshlybakedca.ke / git
Git fork
fork atom
git / mergetools / examdiff
at reftables-rust 24 lines 493 B view raw
Fernando Ramos mergetools: add description to all diff/merge tools
980145f7
1diff_cmd () { 2 "$merge_tool_path" "$LOCAL" "$REMOTE" -nh 3} 4 5diff_cmd_help () { 6 echo "Use ExamDiff Pro (requires a graphical session)" 7} 8 9merge_cmd () { 10 if $base_present 11 then 12 "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh 13 else 14 "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh 15 fi 16} 17 18merge_cmd_help () { 19 echo "Use ExamDiff Pro (requires a graphical session)" 20} 21 22translate_merge_tool_path() { 23 mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" 24}