Skip to content

Commit 1cf6e74

Browse files
committed
implementing merge: some small fixes in merge.rst
1 parent 7d9d266 commit 1cf6e74

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docs/merge.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Example::
2828
The MergeResult object
2929
======================
3030

31-
Represents the result of a merge and contains this fields:
31+
Represents the result of a merge and contains these fields:
3232

3333
- is_uptodate: bool, if there wasn't any merge because the repo was already
34-
up to date
34+
up to date
3535
- is_fastforward: bool, whether the merge was fastforward or not
3636
- fastforward_oid: Oid, in the case it was a fastforward, this is the
37-
forwarded Oid.
37+
forwarded Oid.
3838
- index: represents the repository index after the merge

0 commit comments

Comments
 (0)