Merge remote-tracking branch 'origin/main' into swift-testing

Author: stephencelis

.editorconfig

@@ -0,0 +1,9 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

README.md

@@ -210,9 +210,9 @@ targets: [
   - **`Codable` support**. Snapshot encodable data structures into their JSON and property list
     representations.
   - **Custom diff tool integration**. Configure failure messages to print diff commands for
-    [Kaleidoscope](https://kaleidoscope.app) (or your diff tool of choice).
+    [Kaleidoscope](https://kaleidoscope.app) or your diff tool of choice.
     ``` swift
-    SnapshotTesting.diffTool = "ksdiff"
+    SnapshotTesting.diffToolCommand = { "ksdiff \($0) \($1)" }
     ```
 
 [available-strategies]: https://swiftpackageindex.com/pointfreeco/swift-snapshot-testing/main/documentation/snapshottesting/snapshotting