X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-recursive.py;h=4039435ce4a938fdf9cae4eaa74303d5cc7527d0;hb=6dd36acd32476a474a5b7d2ad309a82c84513abe;hp=ce8a31fda050f36b24b8dffa5ee29e7dde074963;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index ce8a31fda..4039435ce 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -47,7 +47,7 @@ cacheOnly = False
 
 def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0, ancestor=None):
     '''Merge the commits h1 and h2, return the resulting virtual
-    commit object and a flag indicating the cleaness of the merge.'''
+    commit object and a flag indicating the cleanness of the merge.'''
     assert(isinstance(h1, Commit) and isinstance(h2, Commit))
 
     global outputIndent