diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-09 15:11:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-09 15:11:10 -0400 |
| commit | 84a536ab1e9bf1fe98ff57ef53058d933d765477 (patch) | |
| tree | 2ec64d8e02cfd5ce5f848c02b0ad4099175be9ff | |
| parent | 8ca97e43f3543b11b174e5b340903d1f48dee46a (diff) | |
cleanu
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 3 |
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 |