[git/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
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib
require_work_tree

# 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"
}

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
}

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 -a -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
	BACKUP="./${BASE}_BACKUP_$$$ext"
	LOCAL="./${BASE}_LOCAL_$$$ext"
	REMOTE="./${BASE}_REMOTE_$$$ext"
	BASE="./${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

	mv -- "$MERGED" "$BACKUP"
	cp -- "$BACKUP" "$MERGED"

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

	if test -z "$local_mode" -o -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
		return
	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 "$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 || echo true)

while test $# != 0
do
	case "$1" in
	--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
}

if test -z "$merge_tool"
then
	merge_tool=$(get_merge_tool "$merge_tool") || exit
fi
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"

last_status=0
rollup_status=0
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"

IFS='
'
for i in $files
do
	if test $last_status -ne 0
	then
		prompt_after_failed_merge || exit 1
	fi
	printf "\n"
	merge_file "$i"
	last_status=$?
	if test $last_status -ne 0
	then
		rollup_status=1
	fi
done

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