File: opendiff

package info (click to toggle)
git 1%3A2.51.0-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 61,616 kB
  • sloc: ansic: 304,617; sh: 259,866; perl: 25,871; tcl: 21,754; makefile: 4,158; python: 3,442; javascript: 772; csh: 45
file content (22 lines) | stat: -rw-r--r-- 418 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
 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
}

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