Revision d95553a6b8c5153f541adcfc3346004e8249b0e6 authored by Junio C Hamano on 03 April 2016, 17:11:35 UTC, committed by Junio C Hamano on 03 April 2016, 17:14:12 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6e4de7f
kompare
can_merge () {
return 1
}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...