Branch: refs/heads/master Author: Yury Siamashka yurand2@gmail.com Committer: Yury Siamashka yurand2@gmail.com Date: Sun, 28 Jun 2015 07:57:11 UTC Commit: fa8d12e28b7471900b0ebf7f89bc80195a073220 https://github.com/geany/geany-plugins/commit/fa8d12e28b7471900b0ebf7f89bc80...

Log Message: ----------- geanyvc: added WinMerge as new external diff program

Modified Paths: -------------- geanyvc/src/externdiff.c

Modified: geanyvc/src/externdiff.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -33,11 +33,12 @@ enum EXTERNAL_DIFF_KDIFF3, EXTERNAL_DIFF_DIFFUSE, EXTERNAL_DIFF_TKDIFF, + EXTERNAL_DIFF_WINMERGE, EXTERNAL_DIFF_COUNT };

-static const gchar *viewers[EXTERNAL_DIFF_COUNT] = { "meld", "kompare", "kdiff3", "diffuse", "tkdiff" }; +static const gchar *viewers[EXTERNAL_DIFF_COUNT] = { "meld", "kompare", "kdiff3", "diffuse", "tkdiff", "WinMergeU" };

static gchar *extern_diff_viewer = NULL; const gchar *

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).