Merge pull request rust-lang#907 from Adamekka/master

fix typos

Author: ehuss

examples/diff.rs

@@ -96,7 +96,7 @@ struct Args {
     /// output condensed summary of header info
     flag_summary: bool,
     #[structopt(name = "find-renames", short = "M", long)]
-    /// set threshold for findind renames (default 50)
+    /// set threshold for finding renames (default 50)
     flag_find_renames: Option<u16>,
     #[structopt(name = "find-copies", short = "C", long)]
     /// set threshold for finding copies (default 50)
@@ -120,7 +120,7 @@ struct Args {
     /// show given source prefix instead of 'a/'
     flag_src_prefix: Option<String>,
     #[structopt(name = "dst-prefix", long)]
-    /// show given destinction prefix instead of 'b/'
+    /// show given destination prefix instead of 'b/'
     flag_dst_prefix: Option<String>,
     #[structopt(name = "path", long = "git-dir")]
     /// path to git repository to use

examples/pull.rs

@@ -120,7 +120,7 @@ fn normal_merge(
     let mut idx = repo.merge_trees(&ancestor, &local_tree, &remote_tree, None)?;
 
     if idx.has_conflicts() {
-        println!("Merge conficts detected...");
+        println!("Merge conflicts detected...");
         repo.checkout_index(Some(&mut idx), None)?;
         return Ok(());
     }
@@ -152,7 +152,7 @@ fn do_merge<'a>(
     // 1. do a merge analysis
     let analysis = repo.merge_analysis(&[&fetch_commit])?;
 
-    // 2. Do the appopriate merge
+    // 2. Do the appropriate merge
     if analysis.0.is_fast_forward() {
         println!("Doing a fast forward");
         // do a fast forward