branch: scratch/add-vdiff
commit a81d62a0af13008123f9bea12196c30d1d6fbcab
Author: Justin Burkett <[email protected]>
Commit: Justin Burkett <[email protected]>
README: Update recent changes
---
README.org | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.org b/README.org
index 1541b95..499f896 100644
--- a/README.org
+++ b/README.org
@@ -35,6 +35,7 @@ vdiff has not been extensively tested yet, so please report
any issues you
find. Contributions and suggestions are very welcome.
** Recent (Significant) Changes
+ - [2017-02-01] Added magit integration functions in =vdiff-magit.el=. See
[[#magit-integration][Magit integration]].
- [2016-07-25] Added three-way diff support. See =vdiff-buffers3= and
=vdiff-files3=.
** Screenshot
@@ -134,6 +135,7 @@ map. Bind =vdiff-hydra/body= directly to customize this key
binding.
[[file:img/hydra.png]]
** Magit integration
+ #+NAME: #magit-integration
Loading =vdiff-magit= will pull in functions that will allow vdiff to be used
with [[https://github.com/magit/magit][magit]]. In order to use these
functions you need to call the vdiff functions
