Skip to content

Commit a39de43

Browse files
committed
Updated readme with 3-way merge and folder diff images
1 parent aa67b9b commit a39de43

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,18 @@ Resolve a Git conflict:
133133
<img src="screenshots/git_commit_amend.png" alt="Git commit panel with amend mode and live diff preview" width="720">
134134
</p>
135135

136+
### Folder Diff
137+
138+
<p>
139+
<img src="screenshots/folder_diff.png" alt="Recursive folder comparison with aligned file trees and centered status gutter" width="720">
140+
</p>
141+
142+
### Merge Conflicts
143+
144+
<p>
145+
<img src="screenshots/three_way_merge.png" alt="Three-way merge conflict resolver with local, editable result, and incoming panes" width="720">
146+
</p>
147+
136148
## Git Modes
137149

138150
`:DiffBanditGit` accepts common diff scopes:

screenshots/folder_diff.png

266 KB
Loading

screenshots/three_way_merge.png

105 KB
Loading

0 commit comments

Comments
 (0)