diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 15:33:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 15:36:18 -0400 |
| commit | 2caa1330b3abb4bb2ac60eb8b144046d03a1287b (patch) | |
| tree | 0fcbeabf514847b1eb014fa52ba0ad5bb96ecb18 /Annex/Direct.hs | |
| parent | f33f3e5fa2ef208c6fdeb1f26c3dd3f5a0092b1a (diff) | |
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
Still needs work when there are actual merge conflicts.
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index d16692226..cd0835f04 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -37,7 +37,7 @@ import Annex.Perms import Annex.ReplaceFile import Annex.VariantFile import Git.Index -import Annex.Index +import Annex.GitOverlay import Annex.LockFile import Annex.InodeSentinal |