aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/design/adjusted_branches.mdwn3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index 646b86b72..93979ca61 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -189,7 +189,6 @@ like this, at its most simple:
= UnchangedFile FilePath
| UnlockFile FilePath
| HideFile FilePath
- | RenameFile FilePath FilePath
data FileInfo = FileInfo
{ originalBranchFile :: FileStatus
@@ -201,7 +200,7 @@ like this, at its most simple:
filterAction :: Filter -> FilePath -> FileInfo -> FilterAction
filterAction UnlockFilter f fi
- | originalBranchFile fi == Just IsAnnexSymlink = UnlockFile f
+ | originalBranchFile fi == IsAnnexSymlink = UnlockFile f
filterAction HideMissingFilter f fi
| not (isContentPresent fi) = HideFile f
filterAction UnlockHideMissingFilter f fi