components/sysutils/fsvs/patches/05-options_c.patch

   1 --- fsvs-1.2.5/src/options.c    2011-04-29 16:20:18.000000000 +0400
   2 +++ fsvs-1.2.5/src/options.c    2013-08-06 00:20:17.796597800 +0400
   3 @@ -254,13 +254,13 @@
   4                 .parse=opt___string2val, .parm=opt___conflict_strings,
   5         },
   6         [OPT__MERGE_PRG] = {
   7 -               .name="merge_prg", .cp_val="diff3", .parse=opt___store_string,
   8 +               .name="merge_prg", .cp_val="gdiff3", .parse=opt___store_string,
   9         },
  10         [OPT__MERGE_OPT] = {
  11                 .name="merge_opt", .cp_val="-m", .parse=opt___store_string,
  12         },
  13         [OPT__DIFF_PRG] = {
  14 -               .name="diff_prg", .cp_val="diff", .parse=opt___store_string,
  15 +               .name="diff_prg", .cp_val="gdiff", .parse=opt___store_string,
  16         },
  17         [OPT__DIFF_OPT] = {
  18                 .name="diff_opt", .cp_val="-pu", .parse=opt___store_string,