File: diffmerge

package info (click to toggle)
git 1%3A2.11.0-3~bpo8%2B1
  • links: PTS, VCS
  • area: main
  • in suites: jessie-backports
  • size: 34,688 kB
  • sloc: ansic: 175,513; sh: 154,292; perl: 29,745; tcl: 21,549; python: 6,781; makefile: 3,404; lisp: 1,786; php: 120; asm: 98; csh: 45
file content (14 lines) | stat: -rw-r--r-- 275 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

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
}