From 86e34df1180c156efd905fcf24831127f2a23492 Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Fri, 13 Nov 2026 19:46:14 -0500
Subject: [PATCH 1/2] Resolve merge conflict markers in .gitattributes

A Copier update in 2025 committed both sides of a conflict. Keep the template's per-extension line ending rules.

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
---
 .gitattributes | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 8e05465..b40d312 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,11 +3,7 @@ docs/* linguist-documentation
 *.ipynb linguist-documentation
 Makefile linguist-documentation
 
-<<<<<<< before updating
-* text=auto eol=lf
-=======
 *.md text=auto eol=lf
 *.py text=auto eol=lf
 *.toml text=auto eol=lf
 *.yaml text=auto eol=lf
->>>>>>> after updating

From 0a4715f7341ce28dc501e3c570fae4529f8e5e54 Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Fri, 13 Nov 2026 19:46:36 -0500
Subject: [PATCH 2/2] Remove unused DefaultMSVCGenerator table

The table mapped MSVC toolset versions to CMake generator names. It was added with the vcpkg toolchain work and never read. CMake now picks the generator itself, and the table already lacked Visual Studio 2026.

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
---
 hatch_cpp/toolchains/cmake.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/hatch_cpp/toolchains/cmake.py b/hatch_cpp/toolchains/cmake.py
index 82c3fe7..b2b77c0 100644
--- a/hatch_cpp/toolchains/cmake.py
+++ b/hatch_cpp/toolchains/cmake.py
@@ -10,16 +10,6 @@
 
 __all__ = ("HatchCppCmakeConfiguration",)
 
-DefaultMSVCGenerator = {
-    "12": "Visual Studio 12 2013",
-    "14": "Visual Studio 14 2015",
-    "14.0": "Visual Studio 14 2015",
-    "14.1": "Visual Studio 15 2017",
-    "14.2": "Visual Studio 16 2019",
-    "14.3": "Visual Studio 17 2022",
-    "14.4": "Visual Studio 17 2022",
-}
-
 
 class HatchCppCmakeConfiguration(BaseModel):
     root: Path | None = None