Revision 380ba9907737fea75c9e6bbce9df04c556fbf882 authored by Junio C Hamano on 22 October 2020, 22:01:21 UTC, committed by Junio C Hamano on 22 October 2020, 22:01:22 UTC
Brown-paper-bag fix. * js/no-builtins-on-disk-option: SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
smerge
diff_cmd () {
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}
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
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...