[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
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"
    else
	if base_present; then
	    echo "modified file"
	else
	    echo "created file"
	fi
    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

    ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')"
    BACKUP="./$MERGED.BACKUP.$ext"
    LOCAL="./$MERGED.LOCAL.$ext"
    REMOTE="./$MERGED.REMOTE.$ext"
    BASE="./$MERGED.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
}

show_tool_help () {
	TOOL_MODE=merge
	list_merge_tool_candidates
	unavailable= available= LF='
'
	for i in $tools
	do
		merge_tool_path=$(translate_merge_tool_path "$i")
		if type "$merge_tool_path" >/dev/null 2>&1
		then
			available="$available$i$LF"
		else
			unavailable="$unavailable$i$LF"
		fi
	done
	if test -n "$available"
	then
		echo "'git mergetool --tool=<tool>' may be set to one of the following:"
		echo "$available" | sort | sed -e 's/^/	/'
	else
		echo "No suitable tool for 'git mergetool --tool=<tool>' found."
	fi
	if test -n "$unavailable"
	then
		echo
		echo 'The following tools are valid, but not currently available:'
		echo "$unavailable" | sort | sed -e 's/^/	/'
	fi
	if test -n "$unavailable$available"
	then
		echo
		echo "Some of the tools listed above only work in a windowed"
		echo "environment. If run in a terminal-only session, they will fail."
	fi
	exit 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 "$files\n"

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