mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Typo fix unncessary -> unnecessary.

Browse source 
Detected while reading recent CHANGELOG entry but then decided to apply
to entire codebase and docs since why not?
This commit is contained in:
Yaroslav Halchenko 2022-08-19 17:45:04 -04:00 • committed by Joey Hess
parent f091eff476
commit 0151976676
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
43 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/AdjustedBranch/Merge.hs
View file

@ -54,7 +54,7 @@ mergeToAdjustedBranch tomerge (origbranch, adj) mergeconfig canresolvemerge comm
nochangestomerge = return $ return True
{- Since the adjusted branch changes files, merging tomerge
- directly into it would likely result in unncessary merge
- directly into it would likely result in unnecessary merge
- conflicts. To avoid those conflicts, instead merge tomerge into
- updatedorig. The result of the merge can the be
- adjusted to yield the final adjusted branch.