Revision 362de916c06521205276acb7f51c99f47db94727 authored by Junio C Hamano on 10 June 2013, 00:16:20 UTC, committed by Junio C Hamano on 10 June 2013, 19:34:42 UTC
Primarily to push out two regression issues that seem to affect many people, namely, the ".gitignore !directory" bug and "daemon cannot read from $HOME owned by root" bug. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a454065
kompare
can_merge () {
return 1
}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
Computing file changes ...
