diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:23:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:23:01 -0700 |
| commit | 0def7126fda12600017a1d8cd598ee0516cf60a2 (patch) | |
| tree | b6d32fc682657ea5511434178748a7a56a0f56bc /Documentation/technical/index-format.txt | |
| parent | Merge branch 'es/contacts' (diff) | |
| parent | typofix: in-code comments (diff) | |
| download | tgif-0def7126fda12600017a1d8cd598ee0516cf60a2.tar.xz | |
Merge branch 'ob/typofixes'
* ob/typofixes:
typofix: in-code comments
typofix: documentation
typofix: release notes
Diffstat (limited to 'Documentation/technical/index-format.txt')
| -rw-r--r-- | Documentation/technical/index-format.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt index 0810251f5a..f352a9b22e 100644 --- a/Documentation/technical/index-format.txt +++ b/Documentation/technical/index-format.txt @@ -175,7 +175,7 @@ Git index format A conflict is represented in the index as a set of higher stage entries. When a conflict is resolved (e.g. with "git add path"), these higher - stage entries will be removed and a stage-0 entry with proper resoluton + stage entries will be removed and a stage-0 entry with proper resolution is added. When these higher stage entries are removed, they are saved in the |