summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-25 14:10:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-25 14:10:07 -0400
commitbf3472bb1409d9879272471420d6724ee4ed096b (patch)
tree2a8e96b9c2130298897b6adcf2ac3dabd421ce71 /Command/Sync.hs
parent399b31f5f3adfe2b9cd662c8b0e8127067568364 (diff)
use sync command merge engine in assistant
To handle direct mode merging.
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r--Command/Sync.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index e70524ee3..f7241ce82 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -1,7 +1,7 @@
{- git-annex command
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
- Copyright 2011 Joachim Breitner <mail@joachim-breitner.de>
+ - Copyright 2011,2012 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}