File: diffuse

package info (click to toggle)
cgit 1.2.3%2Bgit2.25.1-1
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 44,972 kB
  • sloc: ansic: 236,086; sh: 194,031; perl: 29,806; tcl: 22,076; python: 6,583; makefile: 3,877; sed: 189; php: 120; asm: 98; csh: 45; ruby: 43; lisp: 12
file content (15 lines) | stat: -rw-r--r-- 248 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
 
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
}