Gecko [ edgpens.lpkmn.gov.my ]

Name	Size	Permission
mergetools	[ DIR ]	drwxrwxrwx
Atlassian.Bitbucket.UI.Shared....	22.41 KB	-rw-rw-rw-
Atlassian.Bitbucket.dll	54.91 KB	-rw-rw-rw-
GitHub.UI.Shared.dll	29.41 KB	-rw-rw-rw-
GitHub.dll	83.91 KB	-rw-rw-rw-
GitLab.UI.Shared.dll	24.41 KB	-rw-rw-rw-
GitLab.dll	38.91 KB	-rw-rw-rw-
Microsoft.AzureRepos.dll	60.91 KB	-rw-rw-rw-
Microsoft.Identity.Client.Desk...	106.91 KB	-rw-rw-rw-
Microsoft.Identity.Client.Exte...	61.91 KB	-rw-rw-rw-
Microsoft.Identity.Client.dll	1.45 MB	-rw-rw-rw-
Microsoft.Web.WebView2.Core.dl...	217.91 KB	-rw-rw-rw-
Microsoft.Web.WebView2.WinForm...	32.91 KB	-rw-rw-rw-
Microsoft.Web.WebView2.Wpf.dll	36.91 KB	-rw-rw-rw-
Newtonsoft.Json.dll	685.91 KB	-rw-rw-rw-
System.Buffers.dll	21.41 KB	-rw-rw-rw-
System.CommandLine.dll	211.41 KB	-rw-rw-rw-
System.Memory.dll	138.91 KB	-rw-rw-rw-
System.Numerics.Vectors.dll	107.41 KB	-rw-rw-rw-
System.Runtime.CompilerService...	17.41 KB	-rw-rw-rw-
WebView2Loader.dll	108.92 KB	-rw-rw-rw-
edit.dll	53 KB	-rw-rw-rw-
gcmcore.dll	269.91 KB	-rw-rw-rw-
gcmcoreui.dll	23.41 KB	-rw-rw-rw-
gcmcoreuiwpf.dll	36.41 KB	-rw-rw-rw-
git-add--interactive	48.16 KB	-rw-rw-rw-
git-add.exe	44.55 KB	-rwxrwxrwx
git-am.exe	44.55 KB	-rwxrwxrwx
git-annotate.exe	44.55 KB	-rwxrwxrwx
git-apply.exe	44.55 KB	-rwxrwxrwx
git-archive.exe	44.55 KB	-rwxrwxrwx
git-bisect	2.09 KB	-rw-rw-rw-
git-bisect--helper.exe	44.55 KB	-rwxrwxrwx
git-blame.exe	44.55 KB	-rwxrwxrwx
git-branch.exe	44.55 KB	-rwxrwxrwx
git-bugreport.exe	44.55 KB	-rwxrwxrwx
git-bundle.exe	44.55 KB	-rwxrwxrwx
git-cat-file.exe	44.55 KB	-rwxrwxrwx
git-check-attr.exe	44.55 KB	-rwxrwxrwx
git-check-ignore.exe	44.55 KB	-rwxrwxrwx
git-check-mailmap.exe	44.55 KB	-rwxrwxrwx
git-check-ref-format.exe	44.55 KB	-rwxrwxrwx
git-checkout--worker.exe	44.55 KB	-rwxrwxrwx
git-checkout-index.exe	44.55 KB	-rwxrwxrwx
git-checkout.exe	44.55 KB	-rwxrwxrwx
git-cherry-pick.exe	44.55 KB	-rwxrwxrwx
git-cherry.exe	44.55 KB	-rwxrwxrwx
git-citool	687 B	-rw-rw-rw-
git-clean.exe	44.55 KB	-rwxrwxrwx
git-clone.exe	44.55 KB	-rwxrwxrwx
git-column.exe	44.55 KB	-rwxrwxrwx
git-commit-graph.exe	44.55 KB	-rwxrwxrwx
git-commit-tree.exe	44.55 KB	-rwxrwxrwx
git-commit.exe	44.55 KB	-rwxrwxrwx
git-config.exe	44.55 KB	-rwxrwxrwx
git-count-objects.exe	44.55 KB	-rwxrwxrwx
git-credential-cache--daemon.e...	44.55 KB	-rwxrwxrwx
git-credential-cache.exe	44.55 KB	-rwxrwxrwx
git-credential-store.exe	44.55 KB	-rwxrwxrwx
git-credential-wincred.exe	57.08 KB	-rwxrwxrwx
git-credential.exe	44.55 KB	-rwxrwxrwx
git-daemon.exe	2.05 MB	-rwxrwxrwx
git-describe.exe	44.55 KB	-rwxrwxrwx
git-diff-files.exe	44.55 KB	-rwxrwxrwx
git-diff-index.exe	44.55 KB	-rwxrwxrwx
git-diff-tree.exe	44.55 KB	-rwxrwxrwx
git-diff.exe	44.55 KB	-rwxrwxrwx
git-difftool--helper	2.44 KB	-rw-rw-rw-
git-difftool.exe	44.55 KB	-rwxrwxrwx
git-env--helper.exe	44.55 KB	-rwxrwxrwx
git-fast-export.exe	44.55 KB	-rwxrwxrwx
git-fast-import.exe	44.55 KB	-rwxrwxrwx
git-fetch-pack.exe	44.55 KB	-rwxrwxrwx
git-fetch.exe	44.55 KB	-rwxrwxrwx
git-filter-branch	15.49 KB	-rw-rw-rw-
git-fmt-merge-msg.exe	44.55 KB	-rwxrwxrwx
git-for-each-ref.exe	44.55 KB	-rwxrwxrwx
git-for-each-repo.exe	44.55 KB	-rwxrwxrwx
git-format-patch.exe	44.55 KB	-rwxrwxrwx
git-fsck-objects.exe	44.55 KB	-rwxrwxrwx
git-fsck.exe	44.55 KB	-rwxrwxrwx
git-fsmonitor--daemon.exe	44.55 KB	-rwxrwxrwx
git-gc.exe	44.55 KB	-rwxrwxrwx
git-get-tar-commit-id.exe	44.55 KB	-rwxrwxrwx
git-grep.exe	44.55 KB	-rwxrwxrwx
git-gui	687 B	-rw-rw-rw-
git-gui--askpass	1.8 KB	-rw-rw-rw-
git-gui--askyesno	1.57 KB	-rw-rw-rw-
git-gui.tcl	104.12 KB	-rw-rw-rw-
git-hash-object.exe	44.55 KB	-rwxrwxrwx
git-help.exe	44.55 KB	-rwxrwxrwx
git-hook.exe	44.55 KB	-rwxrwxrwx
git-http-backend.exe	2.05 MB	-rwxrwxrwx
git-http-fetch.exe	2.07 MB	-rwxrwxrwx
git-http-push.exe	2.08 MB	-rwxrwxrwx
git-imap-send.exe	2.08 MB	-rwxrwxrwx
git-index-pack.exe	44.55 KB	-rwxrwxrwx
git-init-db.exe	44.55 KB	-rwxrwxrwx
git-init.exe	44.55 KB	-rwxrwxrwx
git-instaweb	21.65 KB	-rw-rw-rw-
git-interpret-trailers.exe	44.55 KB	-rwxrwxrwx
git-log.exe	44.55 KB	-rwxrwxrwx
git-ls-files.exe	44.55 KB	-rwxrwxrwx
git-ls-remote.exe	44.55 KB	-rwxrwxrwx
git-ls-tree.exe	44.55 KB	-rwxrwxrwx
git-mailinfo.exe	44.55 KB	-rwxrwxrwx
git-mailsplit.exe	44.55 KB	-rwxrwxrwx
git-maintenance.exe	44.55 KB	-rwxrwxrwx
git-merge-base.exe	44.55 KB	-rwxrwxrwx
git-merge-file.exe	44.55 KB	-rwxrwxrwx
git-merge-index.exe	44.55 KB	-rwxrwxrwx
git-merge-octopus	2.42 KB	-rw-rw-rw-
git-merge-one-file	3.61 KB	-rw-rw-rw-
git-merge-ours.exe	44.55 KB	-rwxrwxrwx
git-merge-recursive.exe	44.55 KB	-rwxrwxrwx
git-merge-resolve	944 B	-rw-rw-rw-
git-merge-subtree.exe	44.55 KB	-rwxrwxrwx
git-merge-tree.exe	44.55 KB	-rwxrwxrwx
git-merge.exe	44.55 KB	-rwxrwxrwx
git-mergetool	11.29 KB	-rw-rw-rw-
git-mergetool--lib	9.69 KB	-rw-rw-rw-
git-mktag.exe	44.55 KB	-rwxrwxrwx
git-mktree.exe	44.55 KB	-rwxrwxrwx
git-multi-pack-index.exe	44.55 KB	-rwxrwxrwx
git-mv.exe	44.55 KB	-rwxrwxrwx
git-name-rev.exe	44.55 KB	-rwxrwxrwx
git-notes.exe	44.55 KB	-rwxrwxrwx
git-p4	168.59 KB	-rw-rw-rw-
git-pack-objects.exe	44.55 KB	-rwxrwxrwx
git-pack-redundant.exe	44.55 KB	-rwxrwxrwx
git-pack-refs.exe	44.55 KB	-rwxrwxrwx
git-patch-id.exe	44.55 KB	-rwxrwxrwx
git-prune-packed.exe	44.55 KB	-rwxrwxrwx
git-prune.exe	44.55 KB	-rwxrwxrwx
git-pull.exe	44.55 KB	-rwxrwxrwx
git-push.exe	44.55 KB	-rwxrwxrwx
git-quiltimport	3.61 KB	-rw-rw-rw-
git-range-diff.exe	44.55 KB	-rwxrwxrwx
git-read-tree.exe	44.55 KB	-rwxrwxrwx
git-rebase.exe	44.55 KB	-rwxrwxrwx
git-receive-pack.exe	44.55 KB	-rwxrwxrwx
git-reflog.exe	44.55 KB	-rwxrwxrwx
git-remote-ext.exe	44.55 KB	-rwxrwxrwx
git-remote-fd.exe	44.55 KB	-rwxrwxrwx
git-remote-ftp.exe	2.09 MB	-rwxrwxrwx
git-remote-ftps.exe	2.09 MB	-rwxrwxrwx
git-remote-http.exe	2.09 MB	-rwxrwxrwx
git-remote-https.exe	2.09 MB	-rwxrwxrwx
git-remote.exe	44.55 KB	-rwxrwxrwx
git-repack.exe	44.55 KB	-rwxrwxrwx
git-replace.exe	44.55 KB	-rwxrwxrwx
git-request-pull	4.03 KB	-rw-rw-rw-
git-rerere.exe	44.55 KB	-rwxrwxrwx
git-reset.exe	44.55 KB	-rwxrwxrwx
git-restore.exe	44.55 KB	-rwxrwxrwx
git-rev-list.exe	44.55 KB	-rwxrwxrwx
git-rev-parse.exe	44.55 KB	-rwxrwxrwx
git-revert.exe	44.55 KB	-rwxrwxrwx
git-rm.exe	44.55 KB	-rwxrwxrwx
git-send-email	62.44 KB	-rw-rw-rw-
git-send-pack.exe	44.55 KB	-rwxrwxrwx
git-sh-i18n	1.67 KB	-rw-rw-rw-
git-sh-i18n--envsubst.exe	2.04 MB	-rwxrwxrwx
git-sh-setup	8.92 KB	-rw-rw-rw-
git-shortlog.exe	44.55 KB	-rwxrwxrwx
git-show-branch.exe	44.55 KB	-rwxrwxrwx
git-show-index.exe	44.55 KB	-rwxrwxrwx
git-show-ref.exe	44.55 KB	-rwxrwxrwx
git-show.exe	44.55 KB	-rwxrwxrwx
git-sparse-checkout.exe	44.55 KB	-rwxrwxrwx
git-stage.exe	44.55 KB	-rwxrwxrwx
git-stash.exe	44.55 KB	-rwxrwxrwx
git-status.exe	44.55 KB	-rwxrwxrwx
git-stripspace.exe	44.55 KB	-rwxrwxrwx
git-submodule	11.02 KB	-rw-rw-rw-
git-submodule--helper.exe	44.55 KB	-rwxrwxrwx
git-subtree	23.01 KB	-rw-rw-rw-
git-svn	64.26 KB	-rw-rw-rw-
git-switch.exe	44.55 KB	-rwxrwxrwx
git-symbolic-ref.exe	44.55 KB	-rwxrwxrwx
git-tag.exe	44.55 KB	-rwxrwxrwx
git-unpack-file.exe	44.55 KB	-rwxrwxrwx
git-unpack-objects.exe	44.55 KB	-rwxrwxrwx
git-update	218 B	-rw-rw-rw-
git-update-index.exe	44.55 KB	-rwxrwxrwx
git-update-ref.exe	44.55 KB	-rwxrwxrwx
git-update-server-info.exe	44.55 KB	-rwxrwxrwx
git-upload-archive.exe	44.55 KB	-rwxrwxrwx
git-upload-pack.exe	44.55 KB	-rwxrwxrwx
git-var.exe	44.55 KB	-rwxrwxrwx
git-verify-commit.exe	44.55 KB	-rwxrwxrwx
git-verify-pack.exe	44.55 KB	-rwxrwxrwx
git-verify-tag.exe	44.55 KB	-rwxrwxrwx
git-web--browse	4.3 KB	-rw-rw-rw-
git-whatchanged.exe	44.55 KB	-rwxrwxrwx
git-worktree.exe	44.55 KB	-rwxrwxrwx
git-write-tree.exe	44.55 KB	-rwxrwxrwx
git.exe	3.43 MB	-rwxrwxrwx
headless-git.exe	32.05 KB	-rwxrwxrwx
libbrotlicommon.dll	140.04 KB	-rw-rw-rw-
libbrotlidec.dll	50.64 KB	-rw-rw-rw-
libbz2-1.dll	96.82 KB	-rw-rw-rw-
libcares-5.dll	122.1 KB	-rw-rw-rw-
libcrypto-1_1-x64.dll	2.67 MB	-rw-rw-rw-
libcurl-4.dll	664.15 KB	-rw-rw-rw-
libexpat-1.dll	198.82 KB	-rw-rw-rw-
libffi-8.dll	31.14 KB	-rw-rw-rw-
libgcc_s_seh-1.dll	105.17 KB	-rw-rw-rw-
libgmp-10.dll	641.51 KB	-rw-rw-rw-
libhogweed-6.dll	268.31 KB	-rw-rw-rw-
libiconv-2.dll	1.06 MB	-rw-rw-rw-
libidn2-0.dll	230.63 KB	-rw-rw-rw-
libintl-8.dll	133.52 KB	-rw-rw-rw-
libjansson-4.dll	77.08 KB	-rw-rw-rw-
libjemalloc.dll	674.46 KB	-rw-rw-rw-
liblzma-5.dll	147.65 KB	-rw-rw-rw-
libnettle-8.dll	308.12 KB	-rw-rw-rw-
libnghttp2-14.dll	185.59 KB	-rw-rw-rw-
libp11-kit-0.dll	1.03 MB	-rw-rw-rw-
libpcre-1.dll	275.09 KB	-rw-rw-rw-
libpcre2-8-0.dll	624.85 KB	-rw-rw-rw-
libpcreposix-0.dll	40.77 KB	-rw-rw-rw-
libssh2-1.dll	263.79 KB	-rw-rw-rw-
libssl-1_1-x64.dll	539.65 KB	-rw-rw-rw-
libssp-0.dll	42.41 KB	-rw-rw-rw-
libstdc++-6.dll	1.93 MB	-rw-rw-rw-
libtasn1-6.dll	101.04 KB	-rw-rw-rw-
libtre-5.dll	90.15 KB	-rw-rw-rw-
libunistring-2.dll	1.84 MB	-rw-rw-rw-
libwinpthread-1.dll	56.75 KB	-rw-rw-rw-
libxml2-2.dll	1.28 MB	-rw-rw-rw-
libzstd.dll	810.89 KB	-rw-rw-rw-
tcl86.dll	1.6 MB	-rw-rw-rw-
tk86.dll	1.44 MB	-rw-rw-rw-
zlib1.dll	116.24 KB	-rw-rw-rw-

Code Editor : git-mergetool

#!/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<orderfile>] [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 "$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"
}

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

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
	if test "$MERGETOOL_TMPDIR" != "."
	then
		rmdir "$MERGETOOL_TMPDIR"
	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"
			if test "$merge_keep_backup" = "true"
			then
				cleanup_temp_files --save-backup
			else
				cleanup_temp_files
			fi
			return 0
			;;
		[dD]*)
			git rm -- "$MERGED" > /dev/null
			cleanup_temp_files
			return 0
			;;
		[aA]*)
			if test "$merge_keep_temporaries" = "false"
			then
				cleanup_temp_files
			fi
			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="$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" &&
	tmpfile=${tmpfile%%'	'*}

if test $? -eq 0 && test -n "$tmpfile"
	then
		mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
	else
		>"$3"
	fi
}

hide_resolved () {
	git merge-file --ours -q -p "$LOCAL" "$BASE" "$REMOTE" >"$LCONFL"
	git merge-file --theirs -q -p "$LOCAL" "$BASE" "$REMOTE" >"$RCONFL"
	mv -- "$LCONFL" "$LOCAL"
	mv -- "$RCONFL" "$REMOTE"
}

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

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

initialize_merge_tool "$merge_tool" || return

mergetool_tmpdir_init

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

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

base_mode= local_mode= remote_mode=

# here, $IFS is just a LF
	for line in $f
	do
		mode=${line%% *}		# 1st word
		sha1=${line#"$mode "}
		sha1=${sha1%% *}		# 2nd word
		case "${line#$mode $sha1 }" 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 "$local_mode" || is_submodule "$remote_mode"
	then
		echo "Submodule merge conflict for '$MERGED':"
		describe_file "$local_mode" "local" "$local_sha1"
		describe_file "$remote_mode" "remote" "$remote_sha1"
		resolve_submodule_merge
		return
	fi

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

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

# hideResolved preferences hierarchy.
	global_config="mergetool.hideResolved"
	tool_config="mergetool.${merge_tool}.hideResolved"

if enabled=$(git config --type=bool "$tool_config")
	then
		# The user has a specific preference for a specific tool and no
		# other preferences should override that.
		: ;
	elif enabled=$(git config --type=bool "$global_config")
	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 "$enabled" = true && 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 "$enabled" = true
	then
		hide_resolved
	fi

if test -z "$local_mode" || test -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
		status=$?
		rmdir -p "$(dirname "$MERGED")" 2>/dev/null
		return $status
	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 test "$guessed_merge_tool" = true || test "$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_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
}

print_noop_and_exit () {
	echo "No files need merging"
	exit 0
}

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

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

git_dir_init
	require_work_tree

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

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

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

if test $# -eq 0 && test -e "$GIT_DIR/MERGE_RR"
	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 "set $(git rev-parse --sq --prefix "$prefix" -- "$@")"
	fi

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

if test -z "$files"
	then
		print_noop_and_exit
	fi

printf "Merging:\n"
	printf "%s\n" "$files"

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

exit $rc
}

main "$@"

${this.title}

Code Editor : git-mergetool