X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=17e9f10c659844e55e56b0d3a005e5f250f43c20;hb=e66273a6abb8e9cd0967d52113e29c8014a255f8;hp=0cf505ea84d231e4e4997676d4169c5c5c7dd9f9;hpb=eab90210be73a7edc043a285340f8dc8973b9f07;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 0cf505ea8..17e9f10c6 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -3,7 +3,7 @@ git-merge-index(1) NAME ---- -git-merge-index - Runs a merge for files needing merging +git-merge-index - Run a merge for files needing merging SYNOPSIS @@ -59,7 +59,7 @@ Examples: This is modified MM in the branch B. # merge2 This is modified MM in the branch B. # current contents -or +or torvalds@ppc970:~/merge-test> git-merge-index cat AA MM cat: : No such file or directory @@ -85,4 +85,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list