Revision ef937140a602bccea6f36235f1f7f926a90b85f2 authored by Junio C Hamano on 22 July 2014, 17:26:34 UTC, committed by Junio C Hamano on 22 July 2014, 17:26:34 UTC
* sk/test-cmp-bin: t5000, t5003: do not use test_cmp to compare binary files
emerge
diff_cmd () {
"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" \
-f emerge-files-with-ancestor-command \
"$LOCAL" "$REMOTE" "$BASE" \
"$(basename "$MERGED")"
else
"$merge_tool_path" \
-f emerge-files-command \
"$LOCAL" "$REMOTE" \
"$(basename "$MERGED")"
fi
status=$?
}
translate_merge_tool_path() {
echo emacs
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...