use sync command merge engine in assistant
To handle direct mode merging.
This commit is contained in:
parent
9fcfcab485
commit
8a8380f1b7
3 changed files with 9 additions and 4 deletions
|
@ -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.
|
||||
-}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue