Fixed bug of smoke_merge_file

Author: kentkrantz

src/repo.rs

@@ -3424,6 +3424,8 @@ mod tests {
 
         assert!(index.has_conflicts(), "index should have conflicts");
 
+        let mut conflict_count = 0;
+
         let index_conflicts = index.conflicts().unwrap();
         for conflict in index_conflicts {
             let conflict = conflict.unwrap();
@@ -3498,7 +3500,10 @@ mod tests {
                 },
                 merge_file_result_content
             );
+
+            conflict_count += 1;
         }
+        assert_eq!(conflict_count, 1, "There should be one conflict!");
     }
 
     /// create the following: