[thirdparty/git.git] / mergetools / smerge

diff_cmd () {
	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}

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

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

merge_cmd_help () {
	echo "Use Sublime Merge (requires a graphical session)"
}
Commit	Line	Data
eb12adc7 DA	1	diff_cmd () {
	2	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
	3	}
	4
980145f7 FR	5	diff_cmd_help () {
	6	echo "Use Sublime Merge (requires a graphical session)"
	7	}
	8
eb12adc7 DA	9	merge_cmd () {
	10	if $base_present
	11	then
	12	"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
	13	else
	14	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
	15	fi
	16	}
980145f7 FR	17
	18	merge_cmd_help () {
	19	echo "Use Sublime Merge (requires a graphical session)"
	20	}