File: diffmerge

package info (click to toggle)
cgit 1.2.3%2Bgit20250818.80.3346409%2Bgit2.51.0-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 58,624 kB
  • sloc: ansic: 313,383; sh: 260,576; perl: 25,871; tcl: 21,754; makefile: 4,192; python: 3,787; javascript: 810; csh: 45
file content (26 lines) | stat: -rw-r--r-- 460 bytes parent folder | download | duplicates (7) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

diff_cmd_help () {
	echo "Use DiffMerge (requires a graphical session)"
}

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
}

merge_cmd_help () {
	echo "Use DiffMerge (requires a graphical session)"
}

exit_code_trustable () {
	true
}