File: guiffy

package info (click to toggle)
cgit 1.2.1%2Bgit2.18.0-1
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 37,580 kB
  • sloc: ansic: 207,716; sh: 172,917; perl: 28,960; tcl: 21,663; python: 6,441; makefile: 3,642; php: 120; asm: 98; csh: 45; ruby: 24; lisp: 12
file content (18 lines) | stat: -rw-r--r-- 263 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -s "$LOCAL" \
		"$REMOTE" "$BASE" "$MERGED"
	else
		"$merge_tool_path" -m "$LOCAL" \
		"$REMOTE" "$MERGED"
	fi
}

exit_code_trustable () {
	true
}