freshlybakedca.ke
Git fork
1diff_cmd () {
2 "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3}
4
5diff_cmd_help () {
6 echo "Use Diffuse (requires a graphical session)"
7}
8
9merge_cmd () {
10 if $base_present
11 then
12 "$merge_tool_path" \
13 "$LOCAL" "$MERGED" "$REMOTE" \
14 "$BASE" | cat
15 else
16 "$merge_tool_path" \
17 "$LOCAL" "$MERGED" "$REMOTE" | cat
18 fi
19}
20
21merge_cmd_help () {
22 echo "Use Diffuse (requires a graphical session)"
23}