implementing merge: some small fixes in merge.rst

This commit is contained in:
Victor Garcia
2013-12-09 15:51:29 +01:00
parent 7d9d2667e5
commit 1cf6e748e5

View File

@@ -28,7 +28,7 @@ Example::
The MergeResult object
======================
Represents the result of a merge and contains this fields:
Represents the result of a merge and contains these fields:
- is_uptodate: bool, if there wasn't any merge because the repo was already
up to date