Apply suggestions from code review

Co-authored-by: Ralf Jung <post@ralfj.de>

josh-core/src/history.rs

@@ -467,8 +467,8 @@ pub fn unapply_filter(
                     // pushed, we can ignore those conflicts. To do that we perform the merge
                     // twice: Once with the "ours" and once with the "theirs" merge file favor.
                     // After that we do "unapply()" on both resulting trees, which will replace
-                    // The files selected by the filter with the content being pushed.
-                    // If our assumption was correct and all conflicts where in filtered files
+                    // the files selected by the filter with the content being pushed.
+                    // If our assumption was correct and all conflicts were in filtered files,
                     // both resulting trees will be the same and we can pick the result to proceed.
 
                     let mut mergeopts = git2::MergeOptions::new();