File: tortoisemerge

package info (click to toggle)
git 1%3A1.7.10.4-1%2Bwheezy3
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 22,468 kB
  • sloc: ansic: 131,677; sh: 101,927; perl: 25,746; tcl: 20,816; python: 4,441; makefile: 3,418; lisp: 1,785; asm: 98
file content (17 lines) | stat: -rw-r--r-- 279 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
 
can_diff () {
	return 1
}

merge_cmd () {
	if $base_present
	then
		touch "$BACKUP"
		"$merge_tool_path" \
			-base:"$BASE" -mine:"$LOCAL" \
			-theirs:"$REMOTE" -merged:"$MERGED"
		check_unchanged
	else
		echo "TortoiseMerge cannot be used without a base" 1>&2
		return 1
	fi
}