diff options
Diffstat (limited to 'plumbing/format/index/index.go')
| -rw-r--r-- | plumbing/format/index/index.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plumbing/format/index/index.go b/plumbing/format/index/index.go index 0e9132f..e5dc178 100644 --- a/plumbing/format/index/index.go +++ b/plumbing/format/index/index.go @@ -93,10 +93,10 @@ type TreeEntry struct { Hash plumbing.Hash } -// ResolveUndo 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 +// ResolveUndo is used when a conflict is resolved (e.g. with "git add path"), +// these higher stage entries are removed and a stage-0 entry with proper // resolution is added. When these higher stage entries are removed, they are -// saved in the resolve undo extension +// saved in the resolve undo extension. type ResolveUndo struct { Entries []ResolveUndoEntry } |