mirror of https://github.com/git/git.git
24 lines
395 B
Plaintext
24 lines
395 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
|
|
}
|
|
|
|
diff_cmd_help () {
|
|
echo "Use Diffuse (requires a graphical session)"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" \
|
|
"$LOCAL" "$MERGED" "$REMOTE" \
|
|
"$BASE" | cat
|
|
else
|
|
"$merge_tool_path" \
|
|
"$LOCAL" "$MERGED" "$REMOTE" | cat
|
|
fi
|
|
}
|
|
|
|
merge_cmd_help () {
|
|
echo "Use Diffuse (requires a graphical session)"
|
|
}
|