Skip to main content

Browse the archive

Revision fd3ab91ce651d4d0a4ecc21fb7d2246a4da056d5 authored by Junio C Hamano on 28 March 2017, 20:52:23 UTC, committed by Junio C Hamano on 28 March 2017, 20:52:23 UTC 
Merge branch 'jk/execv-dashed-external' into maint
 
Fix for NO_PTHREADS build.

* jk/execv-dashed-external:
  run-command: fix segfault when cleaning forked async process
2 parent s c953cf9 + 7b91929
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