diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
| commit | f63237a18e951b93ac46a0e594f286255e1eaaaf (patch) | |
| tree | a131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/git-merge-index.txt | |
| parent | Merge branch 'jc/fmt-patch' into next (diff) | |
| parent | Cleanup git-send-email.perl:extract_valid_email (diff) | |
| download | tgif-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz | |
Merge branch 'vb/sendemail' into next
* vb/sendemail:
Cleanup git-send-email.perl:extract_valid_email
read-tree --reset: update working tree file for conflicted paths.
Documentation: Spelling fixes
Builtin git-rev-parse.
fetch: do not report "same" unless -verbose.
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 332e023d0f..6cd0601082 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -69,7 +69,7 @@ or fatal: merge program failed where the latter example shows how "git-merge-index" will stop trying to -merge once anything has returned an error (ie "cat" returned an error +merge once anything has returned an error (i.e., "cat" returned an error for the AA file, because it didn't exist in the original, and thus "git-merge-index" didn't even try to merge the MM thing). |