diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-06 13:53:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-06 13:53:11 -0400 |
| commit | bf07e2c921f66965ca0be816975fc608a81c4276 (patch) | |
| tree | 656a7ea2fcae65911b1609db23ae43cfb9aec125 /doc/git-union-merge.mdwn | |
| parent | cd267dea159677c554aa65e04bd20bc14f5b12eb (diff) | |
typo
Diffstat (limited to 'doc/git-union-merge.mdwn')
| -rw-r--r-- | doc/git-union-merge.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn index 495612f36..ed1778910 100644 --- a/doc/git-union-merge.mdwn +++ b/doc/git-union-merge.mdwn @@ -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 |