Skip to main content

Browse the archive

Revision 9d98862bf5d0f0557e1a822491bb792abcd022cf authored by Junio C Hamano on 29 July 2019, 19:38:12 UTC, committed by Junio C Hamano on 29 July 2019, 19:38:12 UTC 
Merge branch 'vn/xmmap-gently' into maint
 
Clean-up an error codepath.

* vn/xmmap-gently:
  read-cache.c: do not die if mmap fails
2 parent s 2b31284 + 02638d1
Raw File
diffuse 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" \
			"$BASE" | cat
	else
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" | cat
	fi
}
back to top