Merge commit 'refs/merge-requests/1' of git://gitorious.org/procps/procps

diff --cc watch.1
Simple merge

diff --cc watch.c
index dc1198681ae42a431104145a90d45d99c0332e98,2c4a4b0473c12d6cba8a9b2cafdb2efdf28b36ee..69d3a0ae5b919fbd283f656ff496c150c05e618c
--- 1/watch.c
--- 2/watch.c
+++ b/watch.c
@@@ -67,9 -67,9 +67,10 @@@ static void __attribute__ ((__noreturn_
        fputs(USAGE_OPTIONS, out);
        fputs(_("  -b, --beep             beep if command has a non-zero exit\n"
                "  -c, --color            interpret ANSI color sequences\n"
 -              "  -d, --differences      highlight changes between updates\n"
 +              "  -d, --differences[=<permanent>]\n"
 +                "                         highlight changes between updates\n"
                "  -e, --errexit          exit if command has a non-zero exit\n"
+               "  -g, --chgexit          exit when output from command changes\n"
                "  -n, --interval <secs>  seconds to wait between updates\n"
                "  -p, --precise          attempt run command in precise intervals\n"
                "  -t, --no-title         turn off header\n"
@@@ -706,7 -722,9 +723,7 @@@ int main(int argc, char *argv[]
                                usleep(next_loop - cur_time);
                } else
                        usleep(interval * 1000000);
-       }
+       } while (!exit_early);
  
 -      endwin();
 -
 -      return EXIT_SUCCESS;
 +      return EXIT_FAILURE;
  }