Commit cf48eb7d authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'fix-doc-comment'

5541360f MergeResult: fix a doc comment
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King's avatarBrad King <brad.king@kitware.com>
Merge-request: !47
parents 4367abfb 5541360f
...@@ -140,9 +140,7 @@ pub enum MergeResult<'a> { ...@@ -140,9 +140,7 @@ pub enum MergeResult<'a> {
Conflict(Vec<Conflict>), Conflict(Vec<Conflict>),
/// The merge is ready to be committed. /// The merge is ready to be committed.
/// ///
/// The command may be executed in order to create the commit from the merged tree. It is /// The command may be executed in order to create the commit from the merged tree.
/// expected that the relevant `GIT_` environment variables are used on the command to set the
/// author and committer information.
Ready(MergeCommand), Ready(MergeCommand),
#[doc(hidden)] #[doc(hidden)]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment