diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest
new file mode 100644
index 0000000..07a45c1
--- /dev/null
+++ b/dev-vcs/git-imerge/Manifest
@@ -0,0 +1 @@
+DIST git-imerge-1.2.0.tar.gz 64449 BLAKE2B bae4266f288320b8fe3637f6e3c133ed423a2c85a56f03db4a3210eb99f66c8e11c61cecf7ea0335f4798c92a175acad5525494680c5c3531403fa433b221ee9 SHA512 63734091b95edf8881f776422cf8186544f849c46b010884f40b2ccdae7e02302467e040bd5b71d44a489b58255963cb97b61fe0ceae4c22e82a3823a6ad6828
diff --git a/dev-vcs/git-imerge/git-imerge-1.2.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.2.0.ebuild
new file mode 100644
index 0000000..79cc100
--- /dev/null
+++ b/dev-vcs/git-imerge/git-imerge-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Incremental merge for git"
+HOMEPAGE="https://github.com/mhagger/git-imerge"
+SRC_URI="https://github.com/mhagger/git-imerge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-vcs/git"
+DEPEND="dev-python/docutils"
+
+src_compile() {
+	distutils-r1_src_compile
+	rst2s5.py \
+		--theme=small-white \
+		--current-slide \
+		doc/presentations/GitMerge-2013/talk.rst \
+		"${T}/talk.html" \
+		|| die 'failed to convert talk.rst to ${T}/talk.html'
+}
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp completions/git-imerge git-imerge
+	dodoc "${T}"/*html
+	# Don't forget the CSS for the presentation.
+	dodoc -r "${T}/ui"
+}