diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-13 13:49:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-13 13:49:28 -0400 |
| commit | 7ca1389ca8a8786e7ddb3ae8954efbffb97a7713 (patch) | |
| tree | 1cf6364f405fd5c43eb012f394e97079c5d6f8f8 /Annex/Direct.hs | |
| parent | a82f5af34e255253b38e7862436fc86f96316cda (diff) | |
sync: Fix bug that caused direct mode mappings to not be updated when merging files into the tree on Windows.
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 d2e2cdc00..b66b2fdfd 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -15,7 +15,7 @@ import qualified Git.DiffTree as DiffTree import Git.Sha import Git.Types import Annex.CatFile -import Utility.FileMode +import Git.FileMode import qualified Annex.Queue import Logs.Location import Backend |