feat: Add examples (#1)

Staormin · Nov 4, 2024 · b399d33 · b399d33
1 parent 883a202
commit b399d33
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: ci
 
 on:
     push:
-        branches: [ main ]
+        branches: [ main, feature/* ]
 
 jobs:
     check-code:

diff --git a/Readme.md b/Readme.md
@@ -52,3 +52,52 @@ make merge-view
 make cc
 ```
 
+## Example output
+
+Difference
+
+<img src="examples/0-output-difference.png" width='500' />
+
+Difference truncated
+
+<img src="examples/0-output-difference-truncated.png" width='500' />
+
+Side by Side unmerged
+
+<img src="examples/1-output-side-to-side-unmerged.png" width='500' />
+
+Side by Side unmerged truncated
+
+<img src="examples/1-output-side-to-side-unmerged-truncated.png" width='500' />
+
+Side by Side merged
+
+<img src="examples/2-output-side-to-side-merged.png" width='500' />
+
+Side by Side merged truncated
+
+<img src="examples/2-output-side-to-side-merged-truncated.png" width='500' />
+
+Multi line merged
+
+<img src="examples/3-output-multiple-lines-merged.png" width='100' />
+
+Multi line unmerged
+
+<img src="examples/4-output-multiple-lines-unmerged.png" width='100' />
+
+Multi line shift unmerged full space
+
+<img src="examples/5-output-multiple-lines-shifted-unmerged-full-space.png" width='100' />
+
+Multi line shift unmerged half space
+
+<img src="examples/6-output-multiple-lines-shifted-unmerged-half-space.png" width='100' />
+
+Multi line shift merged full space
+
+<img src="examples/7-output-multiple-lines-shifted-merged-full-space.png" width='100' />
+
+Multi line shift merged half space
+
+<img src="examples/8-output-multiple-lines-shifted-merged-half-space.png" width='100' />
diff --git a/examples/0-output-difference-truncated.png b/examples/0-output-difference-truncated.png
diff --git a/examples/0-output-difference.png b/examples/0-output-difference.png
diff --git a/examples/1-output-side-to-side-unmerged-truncated.png b/examples/1-output-side-to-side-unmerged-truncated.png
diff --git a/examples/1-output-side-to-side-unmerged.png b/examples/1-output-side-to-side-unmerged.png
diff --git a/examples/2-output-side-to-side-merged-truncated.png b/examples/2-output-side-to-side-merged-truncated.png
diff --git a/examples/2-output-side-to-side-merged.png b/examples/2-output-side-to-side-merged.png
diff --git a/examples/3-output-multiple-lines-merged.png b/examples/3-output-multiple-lines-merged.png
diff --git a/examples/4-output-multiple-lines-unmerged.png b/examples/4-output-multiple-lines-unmerged.png
diff --git a/examples/5-output-multiple-lines-shifted-unmerged-full-space.png b/examples/5-output-multiple-lines-shifted-unmerged-full-space.png
diff --git a/examples/6-output-multiple-lines-shifted-unmerged-half-space.png b/examples/6-output-multiple-lines-shifted-unmerged-half-space.png
diff --git a/examples/7-output-multiple-lines-shifted-merged-full-space.png b/examples/7-output-multiple-lines-shifted-merged-full-space.png
diff --git a/examples/8-output-multiple-lines-shifted-merged-half-space.png b/examples/8-output-multiple-lines-shifted-merged-half-space.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: ci @@
     on:
         push:
-            branches: [ main ]
+            branches: [ main, feature/* ]
     jobs:
         check-code:
@@ Expand Down @@