Skip to main content

Browse the archive

Revision 650c90a18506ce05e2be349d83fe1cef3dc7f8cb authored by Junio C Hamano on 14 March 2014, 21:25:31 UTC, committed by Junio C Hamano on 14 March 2014, 21:25:31 UTC 
Merge branch 'nd/no-more-fnmatch'
 
We started using wildmatch() in place of fnmatch(3); complete the
process and stop using fnmatch(3).

* nd/no-more-fnmatch:
  actually remove compat fnmatch source code
  stop using fnmatch (either native or compat)
  Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"
  use wildmatch() directly without fnmatch() wrapper
2 parent s 3a66e1b + 2c0a1bd
Raw File
diffmerge 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --merge --result="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" --merge \
			--result="$MERGED" "$LOCAL" "$REMOTE"
	fi
	status=$?
}
back to top