diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-18 17:15:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-18 17:15:16 -0400 |
| commit | ea7dc8c893299331684ac0f68b78e96ad037baef (patch) | |
| tree | 0953358a62c7c9e7dc7aa3de6c733d702f114606 /Command/Direct.hs | |
| parent | 845de8f36631f8bb18abba43d00e44fa38e91cbf (diff) | |
partial and incomplete automatic merging in direct mode
Handles our file right, but not theirs.
Diffstat (limited to 'Command/Direct.hs')
| -rw-r--r-- | Command/Direct.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Direct.hs b/Command/Direct.hs index 991930c38..8e7f40145 100644 --- a/Command/Direct.hs +++ b/Command/Direct.hs @@ -41,7 +41,7 @@ perform = do next cleanup where go = whenAnnexed $ \f (k, _) -> do - r <- toDirect k f + r <- toDirectGen k f case r of Nothing -> noop Just a -> do |