summaryrefslogtreecommitdiff
path: root/Omni/Task.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Omni/Task.hs')
-rw-r--r--Omni/Task.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Omni/Task.hs b/Omni/Task.hs
index 36b318b..8f62e4e 100644
--- a/Omni/Task.hs
+++ b/Omni/Task.hs
@@ -112,6 +112,8 @@ move args
| args `Cli.has` Cli.command "init" = do
let quiet = args `Cli.has` Cli.longOption "quiet"
initTaskDb
+ callCommand "git config merge.agent.name 'Agent Merge Driver' || true"
+ callCommand "git config merge.agent.driver 'agent merge-driver %A %B' || true"
unless quiet <| putText "Task database initialized. Use 'task create' to add tasks."
| args `Cli.has` Cli.command "create" = do
title <- getArgText args "title"