From bf07e2c921f66965ca0be816975fc608a81c4276 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Nov 2011 13:53:11 -0400 Subject: [PATCH] typo --- doc/git-union-merge.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn index 495612f36d..ed1778910b 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