Note: You are currently viewing documentation for Moodle 2.3. Up-to-date documentation for the latest stable version is available here: Unmerged files.

Development:Unmerged files: Difference between revisions

From MoodleDocs
Line 102: Line 102:
  > <?php  // $Id: format.php,v 1.7.2.3 2007/10/15 05:42:38 nicolasconnault Exp $
  > <?php  // $Id: format.php,v 1.7.2.3 2007/10/15 05:42:38 nicolasconnault Exp $


==Files with MOODLE_19_MERGED tag not updated - Sun Oct 14 18:34:13 CEST 2007 ==
==Files with MOODLE_19_MERGED tag not updated - Thu Oct 18 18:41:39 CEST 2007 ==
    
    
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/weblib.php /cvsroot/moodle/moodle/lib/weblib.php]
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/version.php /cvsroot/moodle/moodle/version.php]
  < <?php // $Id: weblib.php,v 1.970.2.5 2007/10/12 10:35:55 tjhunt Exp $  
 
  > <?php // $Id: weblib.php,v 1.970.2.6 2007/10/12 15:11:39 tjhunt Exp $  
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/delete.php /cvsroot/moodle/moodle/admin/delete.php]
  <  * @version $Id: weblib.php,v 1.970.2.5 2007/10/12 10:35:55 tjhunt Exp $  
< <?PHP //$Id: delete.php,v 1.13 2007/04/30 17:08:44 skodak Exp $
  >  * @version $Id: weblib.php,v 1.970.2.6 2007/10/12 15:11:39 tjhunt Exp $  
> <?PHP //$Id: delete.php,v 1.13.4.1 2007/10/15 05:42:23 nicolasconnault Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/peers.html /cvsroot/moodle/moodle/admin/mnet/peers.html]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/mnet/auth.php /cvsroot/moodle/moodle/auth/mnet/auth.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/backup/lib.php /cvsroot/moodle/moodle/backup/lib.php]
  < <?php //$Id: lib.php,v 1.89.2.1 2007/10/12 20:24:05 nicolasconnault Exp $
> <?php //$Id: lib.php,v 1.89.2.2 2007/10/15 05:42:24 nicolasconnault Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/backup/bb/restore_bb.php /cvsroot/moodle/moodle/backup/bb/restore_bb.php]
< <?php // $Id: restore_bb.php,v 1.7 2006/03/07 23:41:22 skodak Exp $  
  > <?php // $Id: restore_bb.php,v 1.7.16.1 2007/10/15 05:42:22 nicolasconnault Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/calendar/view.php /cvsroot/moodle/moodle/calendar/view.php]
< <?php // $Id: view.php,v 1.95.2.2 2007/10/12 20:24:07 nicolasconnault Exp $
> <?php // $Id: view.php,v 1.95.2.3 2007/10/15 04:46:06 toyomoyo Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/config.html /cvsroot/moodle/moodle/enrol/mnet/config.html]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/grade/report/lib.php /cvsroot/moodle/moodle/grade/report/lib.php]
< <?php // $Id: lib.php,v 1.30.2.1 2007/10/12 07:17:39 toyomoyo Exp $
> <?php // $Id: lib.php,v 1.30.2.2 2007/10/15 02:02:19 toyomoyo Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/group/autogroup.php /cvsroot/moodle/moodle/group/autogroup.php]
< <?php // $Id: autogroup.php,v 1.1 2007/09/24 21:55:15 mattc-catalyst Exp $  
  > <?php // $Id: autogroup.php,v 1.1.2.1 2007/10/18 03:00:23 mattc-catalyst Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/enrol_mnet.php /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php]
 
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/group.php /cvsroot/moodle/moodle/lang/en_utf8/group.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/mnet.php /cvsroot/moodle/moodle/lang/en_utf8/mnet.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/db/upgrade.php /cvsroot/moodle/moodle/lib/db/upgrade.php]
< <?PHP  //$Id: upgrade.php,v 1.154.2.3 2007/10/14 09:57:52 stronk7 Exp $
> <?PHP //$Id: upgrade.php,v 1.154.2.5 2007/10/16 04:54:13 nicolasconnault Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/testclient.php /cvsroot/moodle/moodle/mnet/testclient.php]
< <?php // $Id: testclient.php,v 1.2 2007/08/29 10:48:47 stronk7 Exp $
> <?php // $Id: testclient.php,v 1.2.2.1 2007/10/17 08:11:50 donal72 Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/client.php /cvsroot/moodle/moodle/mnet/xmlrpc/client.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/server.php /cvsroot/moodle/moodle/mnet/xmlrpc/server.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/xmlparser.php /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/assignment/db/mysql.php /cvsroot/moodle/moodle/mod/assignment/db/mysql.php]
< <?php // $Id: mysql.php,v 1.26 2007/08/29 14:50:41 stronk7 Exp $
> <?php // $Id: mysql.php,v 1.26.2.1 2007/10/15 05:42:24 nicolasconnault Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/assignment/db/postgres7.php /cvsroot/moodle/moodle/mod/assignment/db/postgres7.php]
< <?php // $Id: postgres7.php,v 1.24 2007/08/29 14:50:41 stronk7 Exp $
> <?php // $Id: postgres7.php,v 1.24.2.1 2007/10/15 05:42:23 nicolasconnault Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/chat/lib.php /cvsroot/moodle/moodle/mod/chat/lib.php]
< <?php  // $Id: lib.php,v 1.99.2.1 2007/10/17 07:18:14 toyomoyo Exp $
> <?php  // $Id: lib.php,v 1.99.2.2 2007/10/17 07:28:44 toyomoyo Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/hotpot/lib.php /cvsroot/moodle/moodle/mod/hotpot/lib.php]
< <?PHP  // $Id: lib.php,v 1.79 2007/10/10 12:19:51 skodak Exp $
> <?PHP  // $Id: lib.php,v 1.79.2.1 2007/10/15 05:42:20 nicolasconnault Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/ims/finder.php /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/ims/repository_deploy.php /cvsroot/moodle/moodle/mod/resource/type/ims/repository_deploy.php]
< <?php // $Id: repository_deploy.php,v 1.7 2007/10/10 05:25:24 nicolasconnault Exp $  
  > <?php // $Id: repository_deploy.php,v 1.7.2.1 2007/10/15 05:42:20 nicolasconnault Exp $
 
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/ewiki.php /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/plugins/init.php /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/plugins/spages.php /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/format/blackboard_6/format.php /cvsroot/moodle/moodle/question/format/blackboard_6/format.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/format/coursetestmanager/format.php /cvsroot/moodle/moodle/question/format/coursetestmanager/format.php]
< <?php  // $Id: format.php,v 1.13 2007/10/10 12:19:45 skodak Exp $
> <?php // $Id: format.php,v 1.13.2.1 2007/10/15 05:42:21 nicolasconnault Exp $  
    
    
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/footer.html /cvsroot/moodle/moodle/theme/custom_corners/footer.html]
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/footer.html /cvsroot/moodle/moodle/theme/custom_corners/footer.html]
Line 114: Line 194:
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/meta.php /cvsroot/moodle/moodle/theme/custom_corners/meta.php]
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/meta.php /cvsroot/moodle/moodle/theme/custom_corners/meta.php]
    
    
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/styles_ie6.css /cvsroot/moodle/moodle/theme/custom_corners/styles_ie6.css]
  RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/standard/styles_color.css /cvsroot/moodle/moodle/theme/standard/styles_color.css]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/user_styles.css /cvsroot/moodle/moodle/theme/custom_corners/user_styles.css]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/js/jquery.php /cvsroot/moodle/moodle/theme/custom_corners/js/jquery.php]


==To generate this information yourself==
==To generate this information yourself==

Revision as of 16:42, 18 October 2007


Files with MOODLE_17_MERGED tag not updated - Thu Oct 18 18:40:02 CEST 2007

RCS file: /cvsroot/moodle/moodle/admin/delete.php
< <?PHP //$Id: delete.php,v 1.12 2006/09/25 20:22:56 skodak Exp $ 
> <?PHP //$Id: delete.php,v 1.12.2.1 2007/10/15 05:53:22 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/backup/lib.php
 
RCS file: /cvsroot/moodle/moodle/backup/bb/restore_bb.php
< <?php // $Id: restore_bb.php,v 1.7 2006/03/07 23:41:22 skodak Exp $ 
> <?php // $Id: restore_bb.php,v 1.7.8.1 2007/10/15 05:53:22 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/assignment/db/postgres7.php
< <?php // $Id: postgres7.php,v 1.22.2.1 2006/10/26 22:29:55 stronk7 Exp $ 
> <?php // $Id: postgres7.php,v 1.22.2.2 2007/10/15 05:53:21 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php
< <?PHP  // $Id: lib.php,v 1.57.2.8 2007/09/30 04:18:18 gbateson Exp $ 
> <?PHP  // $Id: lib.php,v 1.57.2.9 2007/10/15 05:53:21 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/repository_deploy.php
< <?php // $Id: repository_deploy.php,v 1.5 2006/09/20 15:04:01 skodak Exp $ 
> <?php // $Id: repository_deploy.php,v 1.5.2.1 2007/10/15 05:53:20 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php
 
RCS file: /cvsroot/moodle/moodle/question/format/blackboard_6/format.php
 
RCS file: /cvsroot/moodle/moodle/question/format/coursetestmanager/format.php
< <?php  // $Id: format.php,v 1.6 2006/04/10 22:10:34 gustav_delius Exp $ 
> <?php  // $Id: format.php,v 1.6.8.1 2007/10/15 05:53:21 nicolasconnault Exp $

Files with MOODLE_18_MERGED tag not updated - Thu Oct 18 18:40:19 CEST 2007

RCS file: /cvsroot/moodle/moodle/admin/delete.php
 
RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html
 
RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php
< <?php // $Id: auth.php,v 1.14.2.13 2007/10/11 13:19:53 nicolasconnault Exp $ 
> <?php // $Id: auth.php,v 1.14.2.14 2007/10/16 08:50:41 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/backup/lib.php
< <?php //$Id: lib.php,v 1.78.2.4 2007/10/12 20:26:48 nicolasconnault Exp $ 
> <?php //$Id: lib.php,v 1.78.2.5 2007/10/15 05:42:40 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/backup/bb/restore_bb.php
< <?php // $Id: restore_bb.php,v 1.7 2006/03/07 23:41:22 skodak Exp $ 
> <?php // $Id: restore_bb.php,v 1.7.12.1 2007/10/15 05:42:42 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php
 
RCS file: /cvsroot/moodle/moodle/mnet/testclient.php
> <?php // $Id: testclient.php,v 1.1.2.1 2007/10/17 08:11:29 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php
 
RCS file: /cvsroot/moodle/moodle/mod/assignment/db/mysql.php
< <?php // $Id: mysql.php,v 1.25 2006/10/26 22:39:12 stronk7 Exp $ 
> <?php // $Id: mysql.php,v 1.25.4.1 2007/10/15 05:42:37 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/assignment/db/postgres7.php
< <?php // $Id: postgres7.php,v 1.23 2006/10/26 22:46:06 stronk7 Exp $ 
> <?php // $Id: postgres7.php,v 1.23.4.1 2007/10/15 05:42:36 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php
< <?PHP  // $Id: lib.php,v 1.66.2.12 2007/10/04 05:11:07 gbateson Exp $ 
> <?PHP  // $Id: lib.php,v 1.66.2.13 2007/10/15 05:42:42 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/repository_deploy.php
< <?php // $Id: repository_deploy.php,v 1.6 2007/01/04 23:38:19 skodak Exp $ 
> <?php // $Id: repository_deploy.php,v 1.6.2.1 2007/10/15 05:42:36 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php
 
RCS file: /cvsroot/moodle/moodle/question/format/blackboard_6/format.php
 
RCS file: /cvsroot/moodle/moodle/question/format/coursetestmanager/format.php
< <?php  // $Id: format.php,v 1.7.2.2 2007/03/02 01:58:20 toyomoyo Exp $ 
> <?php  // $Id: format.php,v 1.7.2.3 2007/10/15 05:42:38 nicolasconnault Exp $

Files with MOODLE_19_MERGED tag not updated - Thu Oct 18 18:41:39 CEST 2007

RCS file: /cvsroot/moodle/moodle/version.php
 
RCS file: /cvsroot/moodle/moodle/admin/delete.php
< <?PHP //$Id: delete.php,v 1.13 2007/04/30 17:08:44 skodak Exp $ 
> <?PHP //$Id: delete.php,v 1.13.4.1 2007/10/15 05:42:23 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html
 
RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php
 
RCS file: /cvsroot/moodle/moodle/backup/lib.php
< <?php //$Id: lib.php,v 1.89.2.1 2007/10/12 20:24:05 nicolasconnault Exp $ 
> <?php //$Id: lib.php,v 1.89.2.2 2007/10/15 05:42:24 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/backup/bb/restore_bb.php
< <?php // $Id: restore_bb.php,v 1.7 2006/03/07 23:41:22 skodak Exp $ 
> <?php // $Id: restore_bb.php,v 1.7.16.1 2007/10/15 05:42:22 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/calendar/view.php
< <?php // $Id: view.php,v 1.95.2.2 2007/10/12 20:24:07 nicolasconnault Exp $ 
> <?php // $Id: view.php,v 1.95.2.3 2007/10/15 04:46:06 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html
 
RCS file: /cvsroot/moodle/moodle/grade/report/lib.php
< <?php // $Id: lib.php,v 1.30.2.1 2007/10/12 07:17:39 toyomoyo Exp $ 
> <?php // $Id: lib.php,v 1.30.2.2 2007/10/15 02:02:19 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/group/autogroup.php
< <?php // $Id: autogroup.php,v 1.1 2007/09/24 21:55:15 mattc-catalyst Exp $ 
> <?php // $Id: autogroup.php,v 1.1.2.1 2007/10/18 03:00:23 mattc-catalyst Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/group.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php
 
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php
< <?PHP  //$Id: upgrade.php,v 1.154.2.3 2007/10/14 09:57:52 stronk7 Exp $ 
> <?PHP  //$Id: upgrade.php,v 1.154.2.5 2007/10/16 04:54:13 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/testclient.php
< <?php // $Id: testclient.php,v 1.2 2007/08/29 10:48:47 stronk7 Exp $ 
> <?php // $Id: testclient.php,v 1.2.2.1 2007/10/17 08:11:50 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php
 
RCS file: /cvsroot/moodle/moodle/mod/assignment/db/mysql.php
< <?php // $Id: mysql.php,v 1.26 2007/08/29 14:50:41 stronk7 Exp $ 
> <?php // $Id: mysql.php,v 1.26.2.1 2007/10/15 05:42:24 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/assignment/db/postgres7.php
< <?php // $Id: postgres7.php,v 1.24 2007/08/29 14:50:41 stronk7 Exp $ 
> <?php // $Id: postgres7.php,v 1.24.2.1 2007/10/15 05:42:23 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/chat/lib.php
< <?php  // $Id: lib.php,v 1.99.2.1 2007/10/17 07:18:14 toyomoyo Exp $ 
> <?php  // $Id: lib.php,v 1.99.2.2 2007/10/17 07:28:44 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php
< <?PHP  // $Id: lib.php,v 1.79 2007/10/10 12:19:51 skodak Exp $ 
> <?PHP  // $Id: lib.php,v 1.79.2.1 2007/10/15 05:42:20 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/repository_deploy.php
< <?php // $Id: repository_deploy.php,v 1.7 2007/10/10 05:25:24 nicolasconnault Exp $ 
> <?php // $Id: repository_deploy.php,v 1.7.2.1 2007/10/15 05:42:20 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php
 
RCS file: /cvsroot/moodle/moodle/question/format/blackboard_6/format.php
 
RCS file: /cvsroot/moodle/moodle/question/format/coursetestmanager/format.php
< <?php  // $Id: format.php,v 1.13 2007/10/10 12:19:45 skodak Exp $ 
> <?php  // $Id: format.php,v 1.13.2.1 2007/10/15 05:42:21 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/custom_corners/footer.html
 
RCS file: /cvsroot/moodle/moodle/theme/custom_corners/meta.php
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css

To generate this information yourself

Run the following commandline at the top level of your CVS sandbox:

cvs diff -r MOODLE_18_MERGED -r MOODLE_18_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] \/\/ \$Id)' > unmergedfiles.txt; cat unmergedfiles.txt

Some useful links