晋太元中，武陵人捕鱼为业。缘溪行，忘路之远近。忽逢桃花林，夹岸数百步，中无杂树，芳草鲜美，落英缤纷。渔人甚异之，复前行，欲穷其林。 　　林尽水源，便得一山，山有小口，仿佛若有光。便舍船，从口入。初极狭，才通人。复行数十步，豁然开朗。土地平旷，屋舍俨然，有良田、美池、桑竹之属。阡陌交通，鸡犬相闻。其中往来种作，男女衣着，悉如外人。黄发垂髫，并怡然自乐。 　　见渔人，乃大惊，问所从来。具答之。便要还家，设酒杀鸡作食。村中闻有此人，咸来问讯。自云先世避秦时乱，率妻子邑人来此绝境，不复出焉，遂与外人间隔。问今是何世，乃不知有汉，无论魏晋。此人一一为具言所闻，皆叹惋。余人各复延至其家，皆出酒食。停数日，辞去。此中人语云：“不足为外人道也。”(间隔 一作：隔绝) 　　既出，得其船，便扶向路，处处志之。及郡下，诣太守，说如此。太守即遣人随其往，寻向所志，遂迷，不复得路。 　　南阳刘子骥，高尚士也，闻之，欣然规往。未果，寻病终。后遂无问津者。 sh-3ll

HOME


sh-3ll 1.0
DIR:/usr/libexec/git-core/mergetools/
Upload File :
Current File : //usr/libexec/git-core/mergetools/meld
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

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

merge_cmd () {
	check_meld_for_features

	option_auto_merge=
	if test "$meld_use_auto_merge_option" = true
	then
		option_auto_merge="--auto-merge"
	fi

	if test "$meld_has_output_option" = true
	then
		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
	fi
}

merge_cmd_help () {
	echo "Use Meld (requires a graphical session) with optional \`auto merge\` (see \`git help mergetool\`'s \`CONFIGURATION\` section)"
}

# Get meld help message
init_meld_help_msg () {
	if test -z "$meld_help_msg"
	then
		meld_path="$(git config mergetool.meld.path || echo meld)"
		meld_help_msg=$("$meld_path" --help 2>&1)
	fi
}

# Check the features and set flags
check_meld_for_features () {
	# Check whether we should use 'meld --output <file>'
	if test -z "$meld_has_output_option"
	then
		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
		case "$meld_has_output_option" in
		true | false)
			: use configured value
			;;
		*)
			: empty or invalid configured value, detecting "--output" automatically
			init_meld_help_msg

			case "$meld_help_msg" in
			*"--output="* | *'[OPTION...]'*)
				# All version that has [OPTION...] supports --output
				meld_has_output_option=true
				;;
			*)
				meld_has_output_option=false
				;;
			esac
			;;
		esac
	fi
	# Check whether we should use 'meld --auto-merge ...'
	if test -z "$meld_use_auto_merge_option"
	then
		meld_use_auto_merge_option=$(
			git config --bool-or-str mergetool.meld.useAutoMerge
		)
		case "$meld_use_auto_merge_option" in
		true | false)
			: use well formatted boolean value
			;;
		auto)
			# testing the "--auto-merge" option only if config is "auto"
			init_meld_help_msg

			case "$meld_help_msg" in
			*"--auto-merge"* | *'[OPTION...]'*)
				meld_use_auto_merge_option=true
				;;
			*)
				meld_use_auto_merge_option=false
				;;
			esac
			;;
		"")
			meld_use_auto_merge_option=false
			;;
		*)
			die "unknown mergetool.meld.useAutoMerge: $meld_use_auto_merge_option"
			;;
		esac
	fi
}