[thirdparty/git.git] / git-mergetool.sh

#!/bin/sh
#
# This program resolves merge conflicts in git
#
# Copyright (c) 2006 Theodore Y. Ts'o
#
# This file is licensed under the GPL v2, or a later version
# at the discretion of Junio C Hamano.
#

USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes
NONGIT_OK=Yes
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib

# Returns true if the mode reflects a symlink
is_symlink () {
	test "$1" = 120000
}

is_submodule () {
	test "$1" = 160000
}

local_present () {
	test -n "$local_mode"
}

remote_present () {
	test -n "$remote_mode"
}

base_present () {
	test -n "$base_mode"
}

mergetool_tmpdir_init () {
	if test "$(git config --bool mergetool.writeToTemp)" != true
	then
		MERGETOOL_TMPDIR=.
		return 0
	fi
	if MERGETOOL_TMPDIR=$(mktemp -d -t "git-mergetool-XXXXXX" 2>/dev/null)
	then
		return 0
	fi
	die "error: mktemp is needed when 'mergetool.writeToTemp' is true"
}

cleanup_temp_files () {
	if test "$1" = --save-backup
	then
		rm -rf -- "$MERGED.orig"
		test -e "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig"
		rm -f -- "$LOCAL" "$REMOTE" "$BASE"
	else
		rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
	fi
	if test "$MERGETOOL_TMPDIR" != "."
	then
		rmdir "$MERGETOOL_TMPDIR"
	fi
}

describe_file () {
	mode="$1"
	branch="$2"
	file="$3"

	printf "  {%s}: " "$branch"
	if test -z "$mode"
	then
		echo "deleted"
	elif is_symlink "$mode"
	then
		echo "a symbolic link -> '$(cat "$file")'"
	elif is_submodule "$mode"
	then
		echo "submodule commit $file"
	elif base_present
	then
		echo "modified file"
	else
		echo "created file"
	fi
}

resolve_symlink_merge () {
	while true
	do
		printf "Use (l)ocal or (r)emote, or (a)bort? "
		read ans || return 1
		case "$ans" in
		[lL]*)
			git checkout-index -f --stage=2 -- "$MERGED"
			git add -- "$MERGED"
			cleanup_temp_files --save-backup
			return 0
			;;
		[rR]*)
			git checkout-index -f --stage=3 -- "$MERGED"
			git add -- "$MERGED"
			cleanup_temp_files --save-backup
			return 0
			;;
		[aA]*)
			return 1
			;;
		esac
	done
}

resolve_deleted_merge () {
	while true
	do
		if base_present
		then
			printf "Use (m)odified or (d)eleted file, or (a)bort? "
		else
			printf "Use (c)reated or (d)eleted file, or (a)bort? "
		fi
		read ans || return 1
		case "$ans" in
		[mMcC]*)
			git add -- "$MERGED"
			cleanup_temp_files --save-backup
			return 0
			;;
		[dD]*)
			git rm -- "$MERGED" > /dev/null
			cleanup_temp_files
			return 0
			;;
		[aA]*)
			return 1
			;;
		esac
	done
}

resolve_submodule_merge () {
	while true
	do
		printf "Use (l)ocal or (r)emote, or (a)bort? "
		read ans || return 1
		case "$ans" in
		[lL]*)
			if ! local_present
			then
				if test -n "$(git ls-tree HEAD -- "$MERGED")"
				then
					# Local isn't present, but it's a subdirectory
					git ls-tree --full-name -r HEAD -- "$MERGED" |
					git update-index --index-info || exit $?
				else
					test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
					git update-index --force-remove "$MERGED"
					cleanup_temp_files --save-backup
				fi
			elif is_submodule "$local_mode"
			then
				stage_submodule "$MERGED" "$local_sha1"
			else
				git checkout-index -f --stage=2 -- "$MERGED"
				git add -- "$MERGED"
			fi
			return 0
			;;
		[rR]*)
			if ! remote_present
			then
				if test -n "$(git ls-tree MERGE_HEAD -- "$MERGED")"
				then
					# Remote isn't present, but it's a subdirectory
					git ls-tree --full-name -r MERGE_HEAD -- "$MERGED" |
					git update-index --index-info || exit $?
				else
					test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
					git update-index --force-remove "$MERGED"
				fi
			elif is_submodule "$remote_mode"
			then
				! is_submodule "$local_mode" &&
				test -e "$MERGED" &&
				mv -- "$MERGED" "$BACKUP"
				stage_submodule "$MERGED" "$remote_sha1"
			else
				test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
				git checkout-index -f --stage=3 -- "$MERGED"
				git add -- "$MERGED"
			fi
			cleanup_temp_files --save-backup
			return 0
			;;
		[aA]*)
			return 1
			;;
		esac
	done
}

stage_submodule () {
	path="$1"
	submodule_sha1="$2"
	mkdir -p "$path" ||
	die "fatal: unable to create directory for module at $path"
	# Find $path relative to work tree
	work_tree_root=$(cd_to_toplevel && pwd)
	work_rel_path=$(cd "$path" &&
		GIT_WORK_TREE="${work_tree_root}" git rev-parse --show-prefix
	)
	test -n "$work_rel_path" ||
	die "fatal: unable to get path of module $path relative to work tree"
	git update-index --add --replace --cacheinfo 160000 "$submodule_sha1" "${work_rel_path%/}" || die
}

checkout_staged_file () {
	tmpfile=$(expr \
		"$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \
		: '\([^	]*\)	')

	if test $? -eq 0 && test -n "$tmpfile"
	then
		mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
	else
		>"$3"
	fi
}

merge_file () {
	MERGED="$1"

	f=$(git ls-files -u -- "$MERGED")
	if test -z "$f"
	then
		if test ! -f "$MERGED"
		then
			echo "$MERGED: file not found"
		else
			echo "$MERGED: file does not need merging"
		fi
		return 1
	fi

	if BASE=$(expr "$MERGED" : '\(.*\)\.[^/]*$')
	then
		ext=$(expr "$MERGED" : '.*\(\.[^/]*\)$')
	else
		BASE=$MERGED
		ext=
	fi

	mergetool_tmpdir_init

	if test "$MERGETOOL_TMPDIR" != "."
	then
		# If we're using a temporary directory then write to the
		# top-level of that directory.
		BASE=${BASE##*/}
	fi

	BACKUP="$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext"
	LOCAL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext"
	REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
	BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"

	base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}')
	local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')
	remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}')

	if is_submodule "$local_mode" || is_submodule "$remote_mode"
	then
		echo "Submodule merge conflict for '$MERGED':"
		local_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $2;}')
		remote_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $2;}')
		describe_file "$local_mode" "local" "$local_sha1"
		describe_file "$remote_mode" "remote" "$remote_sha1"
		resolve_submodule_merge
		return
	fi

	if test -f "$MERGED"
	then
		mv -- "$MERGED" "$BACKUP"
		cp -- "$BACKUP" "$MERGED"
	fi
	# Create a parent directory to handle delete/delete conflicts
	# where the base's directory no longer exists.
	mkdir -p "$(dirname "$MERGED")"

	checkout_staged_file 1 "$MERGED" "$BASE"
	checkout_staged_file 2 "$MERGED" "$LOCAL"
	checkout_staged_file 3 "$MERGED" "$REMOTE"

	if test -z "$local_mode" || test -z "$remote_mode"
	then
		echo "Deleted merge conflict for '$MERGED':"
		describe_file "$local_mode" "local" "$LOCAL"
		describe_file "$remote_mode" "remote" "$REMOTE"
		resolve_deleted_merge
		status=$?
		rmdir -p "$(dirname "$MERGED")" 2>/dev/null
		return $status
	fi

	if is_symlink "$local_mode" || is_symlink "$remote_mode"
	then
		echo "Symbolic link merge conflict for '$MERGED':"
		describe_file "$local_mode" "local" "$LOCAL"
		describe_file "$remote_mode" "remote" "$REMOTE"
		resolve_symlink_merge
		return
	fi

	echo "Normal merge conflict for '$MERGED':"
	describe_file "$local_mode" "local" "$LOCAL"
	describe_file "$remote_mode" "remote" "$REMOTE"
	if test "$guessed_merge_tool" = true || test "$prompt" = true
	then
		printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
		read ans || return 1
	fi

	if base_present
	then
		present=true
	else
		present=false
	fi

	if ! run_merge_tool "$merge_tool" "$present"
	then
		echo "merge of $MERGED failed" 1>&2
		mv -- "$BACKUP" "$MERGED"

		if test "$merge_keep_temporaries" = "false"
		then
			cleanup_temp_files
		fi

		return 1
	fi

	if test "$merge_keep_backup" = "true"
	then
		mv -- "$BACKUP" "$MERGED.orig"
	else
		rm -- "$BACKUP"
	fi

	git add -- "$MERGED"
	cleanup_temp_files
	return 0
}

prompt=$(git config --bool mergetool.prompt)
guessed_merge_tool=false

while test $# != 0
do
	case "$1" in
	--tool-help=*)
		TOOL_MODE=${1#--tool-help=}
		show_tool_help
		;;
	--tool-help)
		show_tool_help
		;;
	-t|--tool*)
		case "$#,$1" in
		*,*=*)
			merge_tool=$(expr "z$1" : 'z-[^=]*=\(.*\)')
			;;
		1,*)
			usage ;;
		*)
			merge_tool="$2"
			shift ;;
		esac
		;;
	-y|--no-prompt)
		prompt=false
		;;
	--prompt)
		prompt=true
		;;
	--)
		shift
		break
		;;
	-*)
		usage
		;;
	*)
		break
		;;
	esac
	shift
done

prompt_after_failed_merge () {
	while true
	do
		printf "Continue merging other unresolved paths (y/n) ? "
		read ans || return 1
		case "$ans" in
		[yY]*)
			return 0
			;;
		[nN]*)
			return 1
			;;
		esac
	done
}

git_dir_init
require_work_tree

if test -z "$merge_tool"
then
	# Check if a merge tool has been configured
	merge_tool=$(get_configured_merge_tool)
	# Try to guess an appropriate merge tool if no tool has been set.
	if test -z "$merge_tool"
	then
		merge_tool=$(guess_merge_tool) || exit
		guessed_merge_tool=true
	fi
fi
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"

files=

if test $# -eq 0
then
	cd_to_toplevel

	if test -e "$GIT_DIR/MERGE_RR"
	then
		files=$(git rerere remaining)
	else
		files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
	fi
else
	files=$(git ls-files -u -- "$@" | sed -e 's/^[^	]*	//' | sort -u)
fi

if test -z "$files"
then
	echo "No files need merging"
	exit 0
fi

printf "Merging:\n"
printf "%s\n" "$files"

rc=0
for i in $files
do
	printf "\n"
	if ! merge_file "$i"
	then
		rc=1
		prompt_after_failed_merge || exit 1
	fi
done

exit $rc
Commit	Line	Data
c4b4a5af TT	1	#!/bin/sh
	2	#
	3	# This program resolves merge conflicts in git
	4	#
	5	# Copyright (c) 2006 Theodore Y. Ts'o
	6	#
	7	# This file is licensed under the GPL v2, or a later version
2571ac67	8	# at the discretion of Junio C Hamano.
c4b4a5af TT	9	#
c4b4a5af TT	10
109859e2	11	USAGE='[--tool=tool] [--tool-help] [-y\|--no-prompt\|--prompt] [file to merge] ...'
c4b4a5af	12	SUBDIRECTORY_OK=Yes
7bfb7c35	13	NONGIT_OK=Yes
8f321a39	14	OPTIONS_SPEC=
21d0ba7e	15	TOOL_MODE=merge
c4b4a5af	16	. git-sh-setup
21d0ba7e	17	. git-mergetool--lib
c4b4a5af TT	18
c4b4a5af TT	19	# Returns true if the mode reflects a symlink
262c981e	20	is_symlink () {
f8750a0e	21	test "$1" = 120000
c4b4a5af TT	22	}
c4b4a5af TT	23
ff7f089e	24	is_submodule () {
f8750a0e	25	test "$1" = 160000
ff7f089e JM	26	}
ff7f089e JM	27
262c981e	28	local_present () {
f8750a0e	29	test -n "$local_mode"
c4b4a5af TT	30	}
c4b4a5af TT	31
262c981e	32	remote_present () {
f8750a0e	33	test -n "$remote_mode"
c4b4a5af TT	34	}
c4b4a5af TT	35
262c981e	36	base_present () {
f8750a0e	37	test -n "$base_mode"
c4b4a5af TT	38	}
c4b4a5af TT	39
8f0cb41d DA	40	mergetool_tmpdir_init () {
	41	if test "$(git config --bool mergetool.writeToTemp)" != true
	42	then
	43	MERGETOOL_TMPDIR=.
	44	return 0
	45	fi
	46	if MERGETOOL_TMPDIR=$(mktemp -d -t "git-mergetool-XXXXXX" 2>/dev/null)
	47	then
	48	return 0
	49	fi
	50	die "error: mktemp is needed when 'mergetool.writeToTemp' is true"
	51	}
	52
c4b4a5af	53	cleanup_temp_files () {
f8750a0e JH	54	if test "$1" = --save-backup
	55	then
	56	rm -rf -- "$MERGED.orig"
	57	test -e "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig"
	58	rm -f -- "$LOCAL" "$REMOTE" "$BASE"
	59	else
	60	rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
	61	fi
8f0cb41d DA	62	if test "$MERGETOOL_TMPDIR" != "."
	63	then
	64	rmdir "$MERGETOOL_TMPDIR"
	65	fi
c4b4a5af TT	66	}
c4b4a5af TT	67
262c981e	68	describe_file () {
f8750a0e JH	69	mode="$1"
	70	branch="$2"
	71	file="$3"
	72
	73	printf " {%s}: " "$branch"
	74	if test -z "$mode"
	75	then
	76	echo "deleted"
	77	elif is_symlink "$mode"
	78	then
	79	echo "a symbolic link -> '$(cat "$file")'"
	80	elif is_submodule "$mode"
	81	then
	82	echo "submodule commit $file"
	83	elif base_present
	84	then
	85	echo "modified file"
c4b4a5af	86	else
f8750a0e	87	echo "created file"
c4b4a5af	88	fi
c4b4a5af TT	89	}
c4b4a5af TT	90
c4b4a5af	91	resolve_symlink_merge () {
f8750a0e JH	92	while true
	93	do
	94	printf "Use (l)ocal or (r)emote, or (a)bort? "
	95	read ans \|\| return 1
	96	case "$ans" in
	97	[lL]*)
	98	git checkout-index -f --stage=2 -- "$MERGED"
	99	git add -- "$MERGED"
	100	cleanup_temp_files --save-backup
	101	return 0
	102	;;
	103	[rR]*)
	104	git checkout-index -f --stage=3 -- "$MERGED"
	105	git add -- "$MERGED"
	106	cleanup_temp_files --save-backup
	107	return 0
	108	;;
	109	[aA]*)
	110	return 1
	111	;;
	112	esac
c4b4a5af TT	113	done
	114	}
	115
	116	resolve_deleted_merge () {
f8750a0e JH	117	while true
	118	do
	119	if base_present
	120	then
	121	printf "Use (m)odified or (d)eleted file, or (a)bort? "
	122	else
	123	printf "Use (c)reated or (d)eleted file, or (a)bort? "
	124	fi
	125	read ans \|\| return 1
	126	case "$ans" in
	127	[mMcC]*)
	128	git add -- "$MERGED"
	129	cleanup_temp_files --save-backup
	130	return 0
	131	;;
	132	[dD]*)
	133	git rm -- "$MERGED" > /dev/null
	134	cleanup_temp_files
	135	return 0
	136	;;
	137	[aA]*)
	138	return 1
	139	;;
	140	esac
c4b4a5af TT	141	done
	142	}
	143
ff7f089e	144	resolve_submodule_merge () {
f8750a0e JH	145	while true
	146	do
	147	printf "Use (l)ocal or (r)emote, or (a)bort? "
	148	read ans \|\| return 1
	149	case "$ans" in
	150	[lL]*)
	151	if ! local_present
	152	then
	153	if test -n "$(git ls-tree HEAD -- "$MERGED")"
	154	then
	155	# Local isn't present, but it's a subdirectory
	156	git ls-tree --full-name -r HEAD -- "$MERGED" \|
	157	git update-index --index-info \|\| exit $?
	158	else
	159	test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
	160	git update-index --force-remove "$MERGED"
	161	cleanup_temp_files --save-backup
	162	fi
	163	elif is_submodule "$local_mode"
	164	then
	165	stage_submodule "$MERGED" "$local_sha1"
	166	else
	167	git checkout-index -f --stage=2 -- "$MERGED"
	168	git add -- "$MERGED"
	169	fi
	170	return 0
	171	;;
	172	[rR]*)
	173	if ! remote_present
	174	then
	175	if test -n "$(git ls-tree MERGE_HEAD -- "$MERGED")"
	176	then
	177	# Remote isn't present, but it's a subdirectory
	178	git ls-tree --full-name -r MERGE_HEAD -- "$MERGED" \|
	179	git update-index --index-info \|\| exit $?
	180	else
	181	test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
	182	git update-index --force-remove "$MERGED"
	183	fi
	184	elif is_submodule "$remote_mode"
	185	then
	186	! is_submodule "$local_mode" &&
	187	test -e "$MERGED" &&
	188	mv -- "$MERGED" "$BACKUP"
	189	stage_submodule "$MERGED" "$remote_sha1"
	190	else
	191	test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
	192	git checkout-index -f --stage=3 -- "$MERGED"
	193	git add -- "$MERGED"
	194	fi
ff7f089e	195	cleanup_temp_files --save-backup
f8750a0e JH	196	return 0
	197	;;
	198	[aA]*)
	199	return 1
	200	;;
	201	esac
ff7f089e JM	202	done
	203	}
	204
	205	stage_submodule () {
f8750a0e JH	206	path="$1"
	207	submodule_sha1="$2"
	208	mkdir -p "$path" \|\|
	209	die "fatal: unable to create directory for module at $path"
	210	# Find $path relative to work tree
	211	work_tree_root=$(cd_to_toplevel && pwd)
	212	work_rel_path=$(cd "$path" &&
	213	GIT_WORK_TREE="${work_tree_root}" git rev-parse --show-prefix
	214	)
	215	test -n "$work_rel_path" \|\|
	216	die "fatal: unable to get path of module $path relative to work tree"
	217	git update-index --add --replace --cacheinfo 160000 "$submodule_sha1" "${work_rel_path%/}" \|\| die
ff7f089e JM	218	}
ff7f089e JM	219
0ec7b6c2	220	checkout_staged_file () {
f8750a0e JH	221	tmpfile=$(expr \
	222	"$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \
	223	: '\([^ ]*\) ')
	224
1cb49373	225	if test $? -eq 0 && test -n "$tmpfile"
f8750a0e JH	226	then
	227	mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
	228	else
	229	>"$3"
	230	fi
0ec7b6c2 CB	231	}
0ec7b6c2 CB	232
c4b4a5af	233	merge_file () {
f8750a0e	234	MERGED="$1"
c4b4a5af	235
f8750a0e JH	236	f=$(git ls-files -u -- "$MERGED")
	237	if test -z "$f"
	238	then
	239	if test ! -f "$MERGED"
	240	then
	241	echo "$MERGED: file not found"
	242	else
	243	echo "$MERGED: file does not need merging"
	244	fi
	245	return 1
ce5b6d75	246	fi
c4b4a5af	247
eab335c4 DA	248	if BASE=$(expr "$MERGED" : '\(.\)\.[^/]$')
	249	then
	250	ext=$(expr "$MERGED" : '.\(\.[^/]\)$')
	251	else
	252	BASE=$MERGED
	253	ext=
	254	fi
8f0cb41d DA	255
	256	mergetool_tmpdir_init
	257
	258	if test "$MERGETOOL_TMPDIR" != "."
	259	then
	260	# If we're using a temporary directory then write to the
	261	# top-level of that directory.
	262	BASE=${BASE##*/}
	263	fi
	264
	265	BACKUP="$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext"
	266	LOCAL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext"
	267	REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
	268	BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"
f8750a0e JH	269
	270	base_mode=$(git ls-files -u -- "$MERGED" \| awk '{if ($3==1) print $1;}')
	271	local_mode=$(git ls-files -u -- "$MERGED" \| awk '{if ($3==2) print $1;}')
	272	remote_mode=$(git ls-files -u -- "$MERGED" \| awk '{if ($3==3) print $1;}')
	273
	274	if is_submodule "$local_mode" \|\| is_submodule "$remote_mode"
	275	then
	276	echo "Submodule merge conflict for '$MERGED':"
	277	local_sha1=$(git ls-files -u -- "$MERGED" \| awk '{if ($3==2) print $2;}')
	278	remote_sha1=$(git ls-files -u -- "$MERGED" \| awk '{if ($3==3) print $2;}')
	279	describe_file "$local_mode" "local" "$local_sha1"
	280	describe_file "$remote_mode" "remote" "$remote_sha1"
	281	resolve_submodule_merge
	282	return
	283	fi
	284
faaab8d5 DA	285	if test -f "$MERGED"
	286	then
	287	mv -- "$MERGED" "$BACKUP"
	288	cp -- "$BACKUP" "$MERGED"
	289	fi
	290	# Create a parent directory to handle delete/delete conflicts
	291	# where the base's directory no longer exists.
	292	mkdir -p "$(dirname "$MERGED")"
f8750a0e JH	293
	294	checkout_staged_file 1 "$MERGED" "$BASE"
	295	checkout_staged_file 2 "$MERGED" "$LOCAL"
	296	checkout_staged_file 3 "$MERGED" "$REMOTE"
	297
1cb49373	298	if test -z "$local_mode" \|\| test -z "$remote_mode"
f8750a0e JH	299	then
	300	echo "Deleted merge conflict for '$MERGED':"
	301	describe_file "$local_mode" "local" "$LOCAL"
	302	describe_file "$remote_mode" "remote" "$REMOTE"
	303	resolve_deleted_merge
faaab8d5 DA	304	status=$?
	305	rmdir -p "$(dirname "$MERGED")" 2>/dev/null
	306	return $status
f8750a0e JH	307	fi
	308
	309	if is_symlink "$local_mode" \|\| is_symlink "$remote_mode"
	310	then
	311	echo "Symbolic link merge conflict for '$MERGED':"
	312	describe_file "$local_mode" "local" "$LOCAL"
	313	describe_file "$remote_mode" "remote" "$REMOTE"
	314	resolve_symlink_merge
	315	return
	316	fi
	317
	318	echo "Normal merge conflict for '$MERGED':"
c4b4a5af TT	319	describe_file "$local_mode" "local" "$LOCAL"
c4b4a5af TT	320	describe_file "$remote_mode" "remote" "$REMOTE"
4ecc63d7	321	if test "$guessed_merge_tool" = true \|\| test "$prompt" = true
f8750a0e JH	322	then
	323	printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
	324	read ans \|\| return 1
162eba8b CB	325	fi
162eba8b CB	326
f8750a0e JH	327	if base_present
	328	then
	329	present=true
	330	else
	331	present=false
	332	fi
	333
	334	if ! run_merge_tool "$merge_tool" "$present"
	335	then
	336	echo "merge of $MERGED failed" 1>&2
	337	mv -- "$BACKUP" "$MERGED"
	338
	339	if test "$merge_keep_temporaries" = "false"
	340	then
	341	cleanup_temp_files
	342	fi
44c36d1c	343
f8750a0e JH	344	return 1
f8750a0e JH	345	fi
44c36d1c	346
f8750a0e JH	347	if test "$merge_keep_backup" = "true"
	348	then
	349	mv -- "$BACKUP" "$MERGED.orig"
	350	else
	351	rm -- "$BACKUP"
	352	fi
	353
	354	git add -- "$MERGED"
	355	cleanup_temp_files
	356	return 0
c4b4a5af TT	357	}
c4b4a5af TT	358
4ecc63d7 FC	359	prompt=$(git config --bool mergetool.prompt)
4ecc63d7 FC	360	guessed_merge_tool=false
682b451f	361
822f7c73	362	while test $# != 0
c4b4a5af	363	do
f8750a0e	364	case "$1" in
4fb4b02d CB	365	--tool-help=*)
	366	TOOL_MODE=${1#--tool-help=}
	367	show_tool_help
	368	;;
109859e2 JH	369	--tool-help)
	370	show_tool_help
	371	;;
c4b4a5af	372	-t\|--tool*)
f8750a0e	373	case "$#,$1" in
c4b4a5af	374	,=*)
f8750a0e JH	375	merge_tool=$(expr "z$1" : 'z-[^=]=\(.\)')
f8750a0e JH	376	;;
c4b4a5af	377	1,*)
f8750a0e	378	usage ;;
c4b4a5af	379	*)
f8750a0e JH	380	merge_tool="$2"
	381	shift ;;
	382	esac
	383	;;
682b451f	384	-y\|--no-prompt)
f8750a0e JH	385	prompt=false
f8750a0e JH	386	;;
682b451f	387	--prompt)
f8750a0e JH	388	prompt=true
f8750a0e JH	389	;;
c4b4a5af	390	--)
f8750a0e JH	391	shift
	392	break
	393	;;
c4b4a5af	394	-*)
f8750a0e	395	usage
b0169d84	396	;;
f8750a0e JH	397	*)
f8750a0e JH	398	break
b0169d84 CB	399	;;
b0169d84 CB	400	esac
f8750a0e JH	401	shift
	402	done
	403
	404	prompt_after_failed_merge () {
	405	while true
	406	do
	407	printf "Continue merging other unresolved paths (y/n) ? "
	408	read ans \|\| return 1
	409	case "$ans" in
	410	[yY]*)
	411	return 0
	412	;;
	413	[nN]*)
	414	return 1
	415	;;
	416	esac
	417	done
b0169d84	418	}
e3fa2c76	419
7bfb7c35 CB	420	git_dir_init
	421	require_work_tree
	422
f8750a0e JH	423	if test -z "$merge_tool"
f8750a0e JH	424	then
4ecc63d7 FC	425	# Check if a merge tool has been configured
	426	merge_tool=$(get_configured_merge_tool)
	427	# Try to guess an appropriate merge tool if no tool has been set.
	428	if test -z "$merge_tool"
	429	then
	430	merge_tool=$(guess_merge_tool) \|\| exit
	431	guessed_merge_tool=true
	432	fi
47d65924	433	fi
70af4e9b	434	merge_keep_backup="$(git config --bool mergetool.keepBackup \|\| echo true)"
21d0ba7e	435	merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries \|\| echo false)"
c4b4a5af	436
3e8e691a	437	files=
c4b4a5af	438
f8750a0e JH	439	if test $# -eq 0
	440	then
	441	cd_to_toplevel
bb0a484e	442
f8750a0e JH	443	if test -e "$GIT_DIR/MERGE_RR"
	444	then
	445	files=$(git rerere remaining)
	446	else
	447	files=$(git ls-files -u \| sed -e 's/^[^ ]* //' \| sort -u)
	448	fi
3e8e691a	449	else
f8750a0e	450	files=$(git ls-files -u -- "$@" \| sed -e 's/^[^ ]* //' \| sort -u)
3e8e691a	451	fi
af314714	452
f8750a0e JH	453	if test -z "$files"
	454	then
	455	echo "No files need merging"
	456	exit 0
3e8e691a	457	fi
af314714	458
3e8e691a	459	printf "Merging:\n"
59cf706b	460	printf "%s\n" "$files"
bb0a484e	461
98a26022	462	rc=0
6d9990a9	463	for i in $files
3e8e691a	464	do
f8750a0e	465	printf "\n"
98a26022	466	if ! merge_file "$i"
f8750a0e	467	then
98a26022 DA	468	rc=1
98a26022 DA	469	prompt_after_failed_merge \|\| exit 1
f8750a0e	470	fi
3e8e691a	471	done
b0169d84	472
98a26022	473	exit $rc