commit f0d09605d87121b2f1a228c0b74b8f24c82ba03994e76885e43a4234dbdf897a
Author: Matej Cepl <mcepl@suse.com>
Date:   Thu Nov 12 22:51:30 2020 +0000

    Accepting request 848183 from home:bnavigator:branches:devel:languages:python
    
    .
    
    OBS-URL: https://build.opensuse.org/request/show/848183
    OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-three-merge?expand=0&rev=1

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9b03811
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..57affb6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.osc
diff --git a/python-three-merge.changes b/python-three-merge.changes
new file mode 100644
index 0000000..ea63ba5
--- /dev/null
+++ b/python-three-merge.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Thu Nov 12 16:24:00 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Initial specfile for version 0.1.1 
diff --git a/python-three-merge.spec b/python-three-merge.spec
new file mode 100644
index 0000000..09b4fbe
--- /dev/null
+++ b/python-three-merge.spec
@@ -0,0 +1,64 @@
+#
+# spec file for package python-three-merge
+#
+# Copyright (c) 2020 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
+Name:           python-three-merge
+Version:        0.1.1
+Release:        0
+Summary:        Simple library for merging two strings with respect to a base one
+License:        MIT
+URL:            https://github.com/spyder-ide/three-merge
+# Use GitHub archive instead of PyPI sdist because of test files
+Source:         %{url}/archive/v%{version}.tar.gz#/three-merge-%{version}-gh.tar.gz
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+Requires:       python-diff-match-patch
+BuildArch:      noarch
+# SECTION test requirements
+BuildRequires:  %{python_module diff-match-patch}
+BuildRequires:  %{python_module pytest}
+# /SECTION
+%python_subpackages
+
+%description
+Simple Python library to perform a 3-way merge between strings, based on
+diff-match-patch. This library performs merges at a character level, as
+opposed to most VCS systems, which opt for a line-based approach.
+
+%prep
+%setup -q -n three-merge-%{version}
+
+%build
+%python_build
+
+%install
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+
+%check
+%pytest
+
+%files %{python_files}
+%doc CHANGELOG.md README.md
+%license LICENSE
+%{python_sitelib}/three_merge
+%{python_sitelib}/three_merge-%{version}*-info
+
+%changelog
diff --git a/three-merge-0.1.1-gh.tar.gz b/three-merge-0.1.1-gh.tar.gz
new file mode 100644
index 0000000..bae2f13
--- /dev/null
+++ b/three-merge-0.1.1-gh.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6ab2231fd349cdf03be5be04f28c1d59d5a475f7396dcf8fd8b0597981d113e
+size 7312