File Diff

Compare: Compare your active file with another file and look at the differences.

Compare and merge: Same as Compare, but you have the option to merge changes.

Find sync conflicts and merge: Finds all Syncthing conflicts and shows the merge option for each conflict sequentially.

Motivation

I created this plugin because I use SyncThing and it bothered me to clean up merge conflicts by hand.

Installation

1. Search for "File Diff" in the community plugins of Obsidian
2. Install the plugin
3. Enable the plugin

FAQ

1. How do I adjust the colors?

   Adjust the colors by following these instructions.

Contributing

If you have any issues or suggestions, please open an issue on the repository. If you would like to contribute code, please fork the repository and submit a pull request.

Support

For support, please open an issue on the repository, with a reproducible example if possible.

If you're interested in supporting me, it would mean a lot if you could buy me a coffee through GitHub Sponsors, located on the right side.