[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] [file to merge] ...'
SUBDIRECTORY_OK=Yes
. 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
}

save_backup () {
    if test "$status" -eq 0; then
	mv -- "$BACKUP" "$path.orig"
    fi
}

remove_backup () {
    if test "$status" -eq 0; then
	rm "$BACKUP"
    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

    BACKUP="$path.BACKUP.$$"
    LOCAL="$path.LOCAL.$$"
    REMOTE="$path.REMOTE.$$"
    BASE="$path.BASE.$$"

    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=$?
	    remove_backup
	    ;;
	tkdiff)
	    if base_present ; then
		"$merge_tool_path" -a "$BASE" -o "$path" -- "$LOCAL" "$REMOTE"
	    else
		"$merge_tool_path" -o "$path" -- "$LOCAL" "$REMOTE"
	    fi
	    status=$?
	    save_backup
	    ;;
	meld|vimdiff)
	    touch "$BACKUP"
	    "$merge_tool_path" -- "$LOCAL" "$path" "$REMOTE"
	    check_unchanged
	    save_backup
	    ;;
	gvimdiff)
		touch "$BACKUP"
		"$merge_tool_path" -f -- "$LOCAL" "$path" "$REMOTE"
		check_unchanged
		save_backup
		;;
	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
	    save_backup
	    ;;
	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
	    save_backup
	    ;;
	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
	    save_backup
	    ;;
	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=$?
	    save_backup
	    ;;
    esac
    if test "$status" -ne 0; then
	echo "merge of $path failed" 1>&2
	mv -- "$BACKUP" "$path"
	exit 1
    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"

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