summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorBen Sima <ben@bensima.com>2025-11-22 16:58:04 -0500
committerBen Sima <ben@bensima.com>2025-11-22 16:58:04 -0500
commit5ef096d51ff816f9d78033d7e92191041de8c4d7 (patch)
treee97bfa00517dcd0bd8e410618c6749d03ce334c9 /.gitattributes
parentdbb16dd9c86ec5ac0e73f29e32a6beee377672da (diff)
parenta1a4d4d8013487ea9ae48e8b4fef10097fa76a4d (diff)
task: complete t-1o2bxcq7999.1 (Merge)
Amp-Thread-ID: https://ampcode.com/threads/T-ca3b086b-5a85-422a-b13d-256784c04221 Co-authored-by: Amp <amp@ampcode.com>
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 367cb8a..e18b1c8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.tasks/tasks.jsonl merge=task-merge
+.tasks/tasks.jsonl merge=agent