[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] [file to merge] ...'
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. git-sh-setup
require_work_tree
prefix=$(git rev-parse --show-prefix)

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

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
	mv -- "$BACKUP" "$path.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")'"
    else
	if base_present; then
	    echo "modified"
	else
	    echo "created"
	fi
    fi
}


resolve_symlink_merge () {
    while true; do
	printf "Use (l)ocal or (r)emote, or (a)bort? "
	read ans
	case "$ans" in
	    [lL]*)
		git checkout-index -f --stage=2 -- "$path"
		git add -- "$path"
		cleanup_temp_files --save-backup
		return
		;;
	    [rR]*)
		git checkout-index -f --stage=3 -- "$path"
		git add -- "$path"
		cleanup_temp_files --save-backup
		return
		;;
	    [aA]*)
		exit 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
	case "$ans" in
	    [mMcC]*)
		git add -- "$path"
		cleanup_temp_files --save-backup
		return
		;;
	    [dD]*)
		git rm -- "$path" > /dev/null
		cleanup_temp_files
		return
		;;
	    [aA]*)
		exit 1
		;;
	    esac
	done
}

check_unchanged () {
    if test "$path" -nt "$BACKUP" ; then
	status=0;
    else
	while true; do
	    echo "$path seems unchanged."
	    printf "Was the merge successful? [y/n] "
	    read answer < /dev/tty
	    case "$answer" in
		y*|Y*) status=0; break ;;
		n*|N*) status=1; break ;;
	    esac
	done
    fi
}

merge_file () {
    path="$1"

    f=`git ls-files -u -- "$path"`
    if test -z "$f" ; then
	if test ! -f "$path" ; then
	    echo "$path: file not found"
	else
	    echo "$path: file does not need merging"
	fi
	exit 1
    fi

    ext="$$$(expr "$path" : '.*\(\.[^/]*\)$')"
    BACKUP="$path.BACKUP.$ext"
    LOCAL="$path.LOCAL.$ext"
    REMOTE="$path.REMOTE.$ext"
    BASE="$path.BASE.$ext"

    mv -- "$path" "$BACKUP"
    cp -- "$BACKUP" "$path"

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

    base_present   && git cat-file blob ":1:$prefix$path" >"$BASE" 2>/dev/null
    local_present  && git cat-file blob ":2:$prefix$path" >"$LOCAL" 2>/dev/null
    remote_present && git cat-file blob ":3:$prefix$path" >"$REMOTE" 2>/dev/null

    if test -z "$local_mode" -o -z "$remote_mode"; then
	echo "Deleted merge conflict for '$path':"
	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 '$path':"
	describe_file "$local_mode" "local" "$LOCAL"
	describe_file "$remote_mode" "remote" "$REMOTE"
	resolve_symlink_merge
	return
    fi

    echo "Normal merge conflict for '$path':"
    describe_file "$local_mode" "local" "$LOCAL"
    describe_file "$remote_mode" "remote" "$REMOTE"
    printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
    read ans

    case "$merge_tool" in
	kdiff3)
	    if base_present ; then
		("$merge_tool_path" --auto --L1 "$path (Base)" --L2 "$path (Local)" --L3 "$path (Remote)" \
		    -o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
	    else
		("$merge_tool_path" --auto --L1 "$path (Local)" --L2 "$path (Remote)" \
		    -o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
	    fi
	    status=$?
	    ;;
	tkdiff)
	    if base_present ; then
		"$merge_tool_path" -a "$BASE" -o "$path" -- "$LOCAL" "$REMOTE"
	    else
		"$merge_tool_path" -o "$path" -- "$LOCAL" "$REMOTE"
	    fi
	    status=$?
	    ;;
	meld|vimdiff)
	    touch "$BACKUP"
	    "$merge_tool_path" -- "$LOCAL" "$path" "$REMOTE"
	    check_unchanged
	    ;;
	gvimdiff)
	    touch "$BACKUP"
	    "$merge_tool_path" -f -- "$LOCAL" "$path" "$REMOTE"
	    check_unchanged
	    ;;
	xxdiff)
	    touch "$BACKUP"
	    if base_present ; then
		"$merge_tool_path" -X --show-merged-pane \
		    -R 'Accel.SaveAsMerged: "Ctrl-S"' \
		    -R 'Accel.Search: "Ctrl+F"' \
		    -R 'Accel.SearchForward: "Ctrl-G"' \
		    --merged-file "$path" -- "$LOCAL" "$BASE" "$REMOTE"
	    else
		"$merge_tool_path" -X --show-merged-pane \
		    -R 'Accel.SaveAsMerged: "Ctrl-S"' \
		    -R 'Accel.Search: "Ctrl+F"' \
		    -R 'Accel.SearchForward: "Ctrl-G"' \
		    --merged-file "$path" -- "$LOCAL" "$REMOTE"
	    fi
	    check_unchanged
	    ;;
	opendiff)
	    touch "$BACKUP"
	    if base_present; then
		"$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" | cat
	    else
		"$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$path" | cat
	    fi
	    check_unchanged
	    ;;
	ecmerge)
	    touch "$BACKUP"
	    if base_present; then
		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$path"
	    else
		"$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$path"
	    fi
	    check_unchanged
	    ;;
	emerge)
	    if base_present ; then
		"$merge_tool_path" -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$path")"
	    else
		"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" "$(basename "$path")"
	    fi
	    status=$?
	    ;;
    esac
    if test "$status" -ne 0; then
	echo "merge of $path failed" 1>&2
	mv -- "$BACKUP" "$path"
	exit 1
    fi

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

    git add -- "$path"
    cleanup_temp_files
}

while test $# != 0
do
    case "$1" in
	-t|--tool*)
	    case "$#,$1" in
		*,*=*)
		    merge_tool=`expr "z$1" : 'z-[^=]*=\(.*\)'`
		    ;;
		1,*)
		    usage ;;
		*)
		    merge_tool="$2"
		    shift ;;
	    esac
	    ;;
	--)
	    break
	    ;;
	-*)
	    usage
	    ;;
	*)
	    break
	    ;;
    esac
    shift
done

valid_tool() {
	case "$1" in
		kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
			;; # happy
		*)
			return 1
			;;
	esac
}

init_merge_tool_path() {
	merge_tool_path=`git config mergetool.$1.path`
	if test -z "$merge_tool_path" ; then
		case "$1" in
			emerge)
				merge_tool_path=emacs
				;;
			*)
				merge_tool_path=$1
				;;
		esac
	fi
}


if test -z "$merge_tool"; then
    merge_tool=`git config merge.tool`
    if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then
	    echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
	    echo >&2 "Resetting to default..."
	    unset merge_tool
    fi
fi

if test -z "$merge_tool" ; then
    if test -n "$DISPLAY"; then
        merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
        if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
            merge_tool_candidates="meld $merge_tool_candidates"
        fi
        if test "$KDE_FULL_SESSION" = "true"; then
            merge_tool_candidates="kdiff3 $merge_tool_candidates"
        fi
    fi
    if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
        merge_tool_candidates="$merge_tool_candidates emerge"
    fi
    if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then
        merge_tool_candidates="$merge_tool_candidates vimdiff"
    fi
    merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff"
    echo "merge tool candidates: $merge_tool_candidates"
    for i in $merge_tool_candidates; do
        init_merge_tool_path $i
        if type "$merge_tool_path" > /dev/null 2>&1; then
            merge_tool=$i
            break
        fi
    done
    if test -z "$merge_tool" ; then
	echo "No known merge resolution program available."
	exit 1
    fi
else
    if ! valid_tool "$merge_tool"; then
        echo >&2 "Unknown merge_tool $merge_tool"
        exit 1
    fi

    init_merge_tool_path "$merge_tool"

    merge_keep_backup="$(git config --bool merge.keepBackup || echo true)"

    if ! type "$merge_tool_path" > /dev/null 2>&1; then
        echo "The merge tool $merge_tool is not available as '$merge_tool_path'"
        exit 1
    fi
fi


if test $# -eq 0 ; then
	files=`git ls-files -u | sed -e 's/^[^	]*	//' | sort -u`
	if test -z "$files" ; then
		echo "No files need merging"
		exit 0
	fi
	echo Merging the files: "$files"
	git ls-files -u |
	sed -e 's/^[^	]*	//' |
	sort -u |
	while IFS= read i
	do
		printf "\n"
		merge_file "$i" < /dev/tty > /dev/tty
	done
else
	while test $# -gt 0; do
		printf "\n"
		merge_file "$1"
		shift
	done
fi
exit 0
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	#
	10
	11	USAGE='[--tool=tool] [file to merge] ...'
	12	SUBDIRECTORY_OK=Yes
8f321a39	13	OPTIONS_SPEC=
c4b4a5af TT	14	. git-sh-setup
c4b4a5af TT	15	require_work_tree
769f3986	16	prefix=$(git rev-parse --show-prefix)
c4b4a5af TT	17
c4b4a5af TT	18	# Returns true if the mode reflects a symlink
262c981e	19	is_symlink () {
c4b4a5af TT	20	test "$1" = 120000
	21	}
	22
262c981e	23	local_present () {
c4b4a5af TT	24	test -n "$local_mode"
	25	}
	26
262c981e	27	remote_present () {
c4b4a5af TT	28	test -n "$remote_mode"
	29	}
	30
262c981e	31	base_present () {
c4b4a5af TT	32	test -n "$base_mode"
	33	}
	34
	35	cleanup_temp_files () {
	36	if test "$1" = --save-backup ; then
	37	mv -- "$BACKUP" "$path.orig"
	38	rm -f -- "$LOCAL" "$REMOTE" "$BASE"
	39	else
	40	rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
	41	fi
	42	}
	43
262c981e	44	describe_file () {
c4b4a5af TT	45	mode="$1"
	46	branch="$2"
	47	file="$3"
	48
27090aa1	49	printf " {%s}: " "$branch"
c4b4a5af	50	if test -z "$mode"; then
27090aa1	51	echo "deleted"
c4b4a5af	52	elif is_symlink "$mode" ; then
27090aa1	53	echo "a symbolic link -> '$(cat "$file")'"
c4b4a5af TT	54	else
c4b4a5af TT	55	if base_present; then
27090aa1	56	echo "modified"
c4b4a5af	57	else
27090aa1	58	echo "created"
c4b4a5af TT	59	fi
c4b4a5af TT	60	fi
c4b4a5af TT	61	}
	62
	63
	64	resolve_symlink_merge () {
d1dc6959	65	while true; do
27090aa1	66	printf "Use (l)ocal or (r)emote, or (a)bort? "
c4b4a5af TT	67	read ans
	68	case "$ans" in
	69	[lL]*)
5be60078 JH	70	git checkout-index -f --stage=2 -- "$path"
5be60078 JH	71	git add -- "$path"
c4b4a5af TT	72	cleanup_temp_files --save-backup
	73	return
	74	;;
5a174f1a	75	[rR]*)
5be60078 JH	76	git checkout-index -f --stage=3 -- "$path"
5be60078 JH	77	git add -- "$path"
c4b4a5af TT	78	cleanup_temp_files --save-backup
	79	return
	80	;;
5a174f1a	81	[aA]*)
c4b4a5af TT	82	exit 1
	83	;;
	84	esac
	85	done
	86	}
	87
	88	resolve_deleted_merge () {
d1dc6959	89	while true; do
27090aa1 TT	90	if base_present; then
	91	printf "Use (m)odified or (d)eleted file, or (a)bort? "
	92	else
	93	printf "Use (c)reated or (d)eleted file, or (a)bort? "
	94	fi
c4b4a5af TT	95	read ans
c4b4a5af TT	96	case "$ans" in
27090aa1	97	[mMcC]*)
5be60078	98	git add -- "$path"
c4b4a5af TT	99	cleanup_temp_files --save-backup
	100	return
	101	;;
5a174f1a	102	[dD]*)
5be60078	103	git rm -- "$path" > /dev/null
c4b4a5af TT	104	cleanup_temp_files
	105	return
	106	;;
5a174f1a	107	[aA]*)
c4b4a5af TT	108	exit 1
	109	;;
	110	esac
	111	done
	112	}
	113
ddc0c497 TT	114	check_unchanged () {
	115	if test "$path" -nt "$BACKUP" ; then
	116	status=0;
	117	else
	118	while true; do
	119	echo "$path seems unchanged."
	120	printf "Was the merge successful? [y/n] "
	121	read answer < /dev/tty
	122	case "$answer" in
	123	y\|Y) status=0; break ;;
	124	n\|N) status=1; break ;;
	125	esac
	126	done
	127	fi
	128	}
	129
c4b4a5af TT	130	merge_file () {
	131	path="$1"
	132
5be60078	133	f=`git ls-files -u -- "$path"`
c4b4a5af	134	if test -z "$f" ; then
ddc0c497	135	if test ! -f "$path" ; then
ce5b6d75 TT	136	echo "$path: file not found"
	137	else
	138	echo "$path: file does not need merging"
	139	fi
c4b4a5af TT	140	exit 1
	141	fi
	142
c3d51cd1 PR	143	ext="$$$(expr "$path" : '.\(\.[^/]\)$')"
	144	BACKUP="$path.BACKUP.$ext"
	145	LOCAL="$path.LOCAL.$ext"
	146	REMOTE="$path.REMOTE.$ext"
	147	BASE="$path.BASE.$ext"
c4b4a5af TT	148
	149	mv -- "$path" "$BACKUP"
	150	cp -- "$BACKUP" "$path"
	151
	152	base_mode=`git ls-files -u -- "$path" \| awk '{if ($3==1) print $1;}'`
	153	local_mode=`git ls-files -u -- "$path" \| awk '{if ($3==2) print $1;}'`
	154	remote_mode=`git ls-files -u -- "$path" \| awk '{if ($3==3) print $1;}'`
	155
769f3986 JH	156	base_present && git cat-file blob ":1:$prefix$path" >"$BASE" 2>/dev/null
	157	local_present && git cat-file blob ":2:$prefix$path" >"$LOCAL" 2>/dev/null
	158	remote_present && git cat-file blob ":3:$prefix$path" >"$REMOTE" 2>/dev/null
c4b4a5af TT	159
c4b4a5af TT	160	if test -z "$local_mode" -o -z "$remote_mode"; then
27090aa1	161	echo "Deleted merge conflict for '$path':"
c4b4a5af TT	162	describe_file "$local_mode" "local" "$LOCAL"
	163	describe_file "$remote_mode" "remote" "$REMOTE"
	164	resolve_deleted_merge
	165	return
	166	fi
	167
	168	if is_symlink "$local_mode" \|\| is_symlink "$remote_mode"; then
27090aa1	169	echo "Symbolic link merge conflict for '$path':"
c4b4a5af TT	170	describe_file "$local_mode" "local" "$LOCAL"
	171	describe_file "$remote_mode" "remote" "$REMOTE"
	172	resolve_symlink_merge
	173	return
	174	fi
	175
27090aa1	176	echo "Normal merge conflict for '$path':"
c4b4a5af TT	177	describe_file "$local_mode" "local" "$LOCAL"
c4b4a5af TT	178	describe_file "$remote_mode" "remote" "$REMOTE"
20fa04ea	179	printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
c4b4a5af TT	180	read ans
	181
	182	case "$merge_tool" in
	183	kdiff3)
	184	if base_present ; then
e3fa2c76	185	("$merge_tool_path" --auto --L1 "$path (Base)" --L2 "$path (Local)" --L3 "$path (Remote)" \
c4b4a5af TT	186	-o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
c4b4a5af TT	187	else
e3fa2c76	188	("$merge_tool_path" --auto --L1 "$path (Local)" --L2 "$path (Remote)" \
c4b4a5af TT	189	-o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
	190	fi
	191	status=$?
c4b4a5af TT	192	;;
	193	tkdiff)
	194	if base_present ; then
e3fa2c76	195	"$merge_tool_path" -a "$BASE" -o "$path" -- "$LOCAL" "$REMOTE"
c4b4a5af	196	else
e3fa2c76	197	"$merge_tool_path" -o "$path" -- "$LOCAL" "$REMOTE"
c4b4a5af TT	198	fi
c4b4a5af TT	199	status=$?
c4b4a5af	200	;;
9cec6539	201	meld\|vimdiff)
c4b4a5af	202	touch "$BACKUP"
e3fa2c76	203	"$merge_tool_path" -- "$LOCAL" "$path" "$REMOTE"
ddc0c497	204	check_unchanged
c4b4a5af	205	;;
730b5b45	206	gvimdiff)
44c36d1c CB	207	touch "$BACKUP"
	208	"$merge_tool_path" -f -- "$LOCAL" "$path" "$REMOTE"
	209	check_unchanged
	210	;;
c4b4a5af TT	211	xxdiff)
	212	touch "$BACKUP"
	213	if base_present ; then
e3fa2c76	214	"$merge_tool_path" -X --show-merged-pane \
c4b4a5af TT	215	-R 'Accel.SaveAsMerged: "Ctrl-S"' \
	216	-R 'Accel.Search: "Ctrl+F"' \
	217	-R 'Accel.SearchForward: "Ctrl-G"' \
	218	--merged-file "$path" -- "$LOCAL" "$BASE" "$REMOTE"
	219	else
e3fa2c76	220	"$merge_tool_path" -X --show-merged-pane \
c4b4a5af TT	221	-R 'Accel.SaveAsMerged: "Ctrl-S"' \
	222	-R 'Accel.Search: "Ctrl+F"' \
	223	-R 'Accel.SearchForward: "Ctrl-G"' \
	224	--merged-file "$path" -- "$LOCAL" "$REMOTE"
	225	fi
ddc0c497	226	check_unchanged
c4b4a5af	227	;;
365cf979 TT	228	opendiff)
	229	touch "$BACKUP"
	230	if base_present; then
e3fa2c76	231	"$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" \| cat
365cf979	232	else
e3fa2c76	233	"$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$path" \| cat
365cf979 TT	234	fi
365cf979 TT	235	check_unchanged
365cf979	236	;;
ca8e6b7a SP	237	ecmerge)
	238	touch "$BACKUP"
	239	if base_present; then
	240	"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$path"
	241	else
	242	"$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$path"
	243	fi
	244	check_unchanged
ca8e6b7a	245	;;
c4b4a5af TT	246	emerge)
c4b4a5af TT	247	if base_present ; then
e3fa2c76	248	"$merge_tool_path" -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$path")"
c4b4a5af	249	else
e3fa2c76	250	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" "$(basename "$path")"
c4b4a5af TT	251	fi
c4b4a5af TT	252	status=$?
c4b4a5af TT	253	;;
	254	esac
	255	if test "$status" -ne 0; then
	256	echo "merge of $path failed" 1>&2
	257	mv -- "$BACKUP" "$path"
	258	exit 1
	259	fi
44c36d1c CB	260
	261	if test "$merge_keep_backup" = "true"; then
	262	mv -- "$BACKUP" "$path.orig"
	263	else
	264	rm -- "$BACKUP"
	265	fi
	266
c4b4a5af TT	267	git add -- "$path"
	268	cleanup_temp_files
	269	}
	270
822f7c73	271	while test $# != 0
c4b4a5af TT	272	do
	273	case "$1" in
	274	-t\|--tool*)
	275	case "$#,$1" in
	276	,=*)
	277	merge_tool=`expr "z$1" : 'z-[^=]=\(.\)'`
	278	;;
	279	1,*)
	280	usage ;;
	281	*)
	282	merge_tool="$2"
	283	shift ;;
	284	esac
	285	;;
	286	--)
	287	break
	288	;;
	289	-*)
	290	usage
	291	;;
	292	*)
	293	break
	294	;;
	295	esac
	296	shift
	297	done
	298
e3fa2c76 SP	299	valid_tool() {
e3fa2c76 SP	300	case "$1" in
ca8e6b7a	301	kdiff3 \| tkdiff \| xxdiff \| meld \| opendiff \| emerge \| vimdiff \| gvimdiff \| ecmerge)
e3fa2c76 SP	302	;; # happy
	303	*)
	304	return 1
	305	;;
	306	esac
	307	}
	308
	309	init_merge_tool_path() {
	310	merge_tool_path=`git config mergetool.$1.path`
	311	if test -z "$merge_tool_path" ; then
	312	case "$1" in
	313	emerge)
	314	merge_tool_path=emacs
	315	;;
	316	*)
	317	merge_tool_path=$1
	318	;;
	319	esac
	320	fi
	321	}
	322
	323
c4b4a5af	324	if test -z "$merge_tool"; then
5be60078	325	merge_tool=`git config merge.tool`
d279fc1a	326	if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then
d6678c28 TT	327	echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
	328	echo >&2 "Resetting to default..."
	329	unset merge_tool
e3fa2c76	330	fi
c4b4a5af TT	331	fi
	332
	333	if test -z "$merge_tool" ; then
301ac38b TT	334	if test -n "$DISPLAY"; then
	335	merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
	336	if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
	337	merge_tool_candidates="meld $merge_tool_candidates"
	338	fi
	339	if test "$KDE_FULL_SESSION" = "true"; then
	340	merge_tool_candidates="kdiff3 $merge_tool_candidates"
	341	fi
	342	fi
	343	if echo "${VISUAL:-$EDITOR}" \| grep 'emacs' > /dev/null 2>&1; then
	344	merge_tool_candidates="$merge_tool_candidates emerge"
	345	fi
	346	if echo "${VISUAL:-$EDITOR}" \| grep 'vim' > /dev/null 2>&1; then
	347	merge_tool_candidates="$merge_tool_candidates vimdiff"
	348	fi
	349	merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff"
	350	echo "merge tool candidates: $merge_tool_candidates"
	351	for i in $merge_tool_candidates; do
e3fa2c76 SP	352	init_merge_tool_path $i
e3fa2c76 SP	353	if type "$merge_tool_path" > /dev/null 2>&1; then
301ac38b TT	354	merge_tool=$i
	355	break
	356	fi
	357	done
	358	if test -z "$merge_tool" ; then
e3fa2c76	359	echo "No known merge resolution program available."
c4b4a5af TT	360	exit 1
c4b4a5af TT	361	fi
e3fa2c76 SP	362	else
	363	if ! valid_tool "$merge_tool"; then
	364	echo >&2 "Unknown merge_tool $merge_tool"
	365	exit 1
	366	fi
	367
	368	init_merge_tool_path "$merge_tool"
	369
44c36d1c CB	370	merge_keep_backup="$(git config --bool merge.keepBackup \|\| echo true)"
44c36d1c CB	371
e3fa2c76 SP	372	if ! type "$merge_tool_path" > /dev/null 2>&1; then
	373	echo "The merge tool $merge_tool is not available as '$merge_tool_path'"
	374	exit 1
	375	fi
c4b4a5af TT	376	fi
c4b4a5af TT	377
c4b4a5af TT	378
	379	if test $# -eq 0 ; then
	380	files=`git ls-files -u \| sed -e 's/^[^ ]* //' \| sort -u`
	381	if test -z "$files" ; then
	382	echo "No files need merging"
	383	exit 0
	384	fi
2e8fd781 RD	385	echo Merging the files: "$files"
	386	git ls-files -u \|
	387	sed -e 's/^[^ ]* //' \|
	388	sort -u \|
	389	while IFS= read i
c4b4a5af	390	do
20fa04ea	391	printf "\n"
c4b4a5af TT	392	merge_file "$i" < /dev/tty > /dev/tty
	393	done
	394	else
	395	while test $# -gt 0; do
20fa04ea	396	printf "\n"
c4b4a5af TT	397	merge_file "$1"
	398	shift
	399	done
	400	fi
	401	exit 0