blob: 5410835a6b5f6ed3d8e1220f1d98fc73d2457e64 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
diff_cmd () {
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}
diff_cmd_help () {
echo "Use Sublime Merge (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
else
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
fi
}
merge_cmd_help () {
echo "Use Sublime Merge (requires a graphical session)"
}
|
