File: tkdiff

package info (click to toggle)
git 1%3A1.9.1-1~bpo70%2B1
  • links: PTS, VCS
  • area: main
  • in suites: wheezy-backports
  • size: 27,440 kB
  • sloc: ansic: 148,329; sh: 129,286; perl: 28,811; tcl: 21,214; python: 6,911; makefile: 3,501; lisp: 1,786; php: 120; asm: 98; csh: 45
file content (12 lines) | stat: -rw-r--r-- 224 bytes parent folder | download | duplicates (11) 
1
2
3
4
5
6
7
8
9
10
11
12
 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	fi
}