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

typo

Browse source
This commit is contained in:
Joey Hess 2011-11-06 13:53:11 -04:00
parent cd267dea15
commit bf07e2c921
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/git-union-merge.mdwn
View file

@ -15,7 +15,7 @@ The union merge will always succeed, but assumes that files can be merged
simply by concacenating together lines from all the oldrefs, in any order.
So, this is useful only for branches containing log-type data.
That this does not touch the checked out working copy. It operates
Note that this does not touch the checked out working copy. It operates
entirely on git refs and branches.
# EXAMPLE