summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
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