Revision b86a4be245d0ba077c97c6ab6b1cdbeb9dcc1342 authored by Jonathan Nieder on 19 April 2020, 23:30:34 UTC, committed by Jonathan Nieder on 19 April 2020, 23:30:34 UTC
This merges up the security fix from v2.17.5. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
guiffy
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" -s "$LOCAL" \
"$REMOTE" "$BASE" "$MERGED"
else
"$merge_tool_path" -m "$LOCAL" \
"$REMOTE" "$MERGED"
fi
}
exit_code_trustable () {
true
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...