File: ecmerge

package info (click to toggle)
git 1%3A2.30.2-1%2Bdeb11u2
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 53,128 kB
  • sloc: ansic: 237,972; sh: 206,995; perl: 29,970; tcl: 22,151; python: 6,357; makefile: 3,843; javascript: 772; sed: 189; asm: 98; csh: 45; ruby: 43; lisp: 12
file content (14 lines) | stat: -rw-r--r-- 306 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" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
			--default --mode=merge3 --to="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			--default --mode=merge2 --to="$MERGED"
	fi
}