Here's a list of the remaining 39 files to be merged between rel-1-2 and main branches. They are sorted in order of increasing difference. The version numbers tell you if the file has been modified in both branches. For example, systempreferences.pl has never been modified in rel-1-2 (it is still at version 1.1), but has been modified in the main branch (up to version 1.3). The file modbibitem has been modified in both branches. It started at version 1.4 in the rel-1-2 branch, and has been modified once to become 1.4.2.1 (The number 2 signifies the rel-1-2 branch). In the main branch, the file has been modified 4 times since the branch was created to become version 1.8. ======================================================================== C4/InterfaceCDK.pm Lines: 3 Main 1.2 Branch1.1.1.1.2.1 C4/Stats.pm Lines: 5 Main 1.4 Branch 1.3.2.2 C4/Print.pm Lines: 7 Main 1.5 Branch 1.3.2.1 t/Input.t Lines: 8 Main 1.2 Branch 1.1.2.1 testKoha.pl Lines: 9 Main 1.5 Branch 1.1.2.7 modbibitem.pl Lines: 15 Main 1.8 Branch 1.4.2.1 admin/systempreferences.pl Lines: 40 Main 1.3 Branch 1.1 updater/updatedatabase2.pl Lines: 59 Main 1.2 Branch 1.1.2.1 acqui/addorder.pl Lines: 65 Main 1.7 Branch 1.3.2.1 database.mysql Lines: 65 Main 1.7 Branch 1.2.2.6 acqui/newbiblio.pl Lines: 68 Main 1.4 Branch 1.2.2.2 acqui/finishreceive.pl Lines: 71 Main 1.5 Branch1.1.1.1.2.1 acqui.simple/marcimport.pl Lines: 91 Main 1.11 Branch 1.6.2.23 C4/Input.pm Lines: 93 Main 1.1.1.1 Branch1.1.1.1.2.2 memberentry.pl Lines: 104 Main 1.6 Branch 1.6.2.1 updater/updatedatabase Lines: 121 Main 1.10 Branch 1.4.2.6 updatebiblio.pl Lines: 127 Main 1.2 Branch1.1.1.1.2.1 updatebibitem.pl Lines: 137 Main 1.6 Branch 1.4.2.1 search.pl Lines: 167 Main 1.9 Branch 1.6.2.1 acqui/newbasket2.pl Lines: 180 Main 1.2 Branch1.1.1.1.2.2 INSTALL Lines: 181 Main 1.2 Branch 1.1.2.7 modbib.pl Lines: 186 Main 1.4 Branch1.1.1.1.2.1 moredetail.pl Lines: 295 Main 1.7 Branch 1.4.2.1 C4/Reserves2.pm Lines: 314 Main 1.7 Branch 1.5.2.2 C4/Output.pm Lines: 330 Main 1.10 Branch 1.6.2.8 detail.pl Lines: 333 Main 1.9 Branch 1.3 circ/branchtransfers.pl Lines: 337 Main 1.9 Branch 1.3 request.pl Lines: 364 Main 1.3 Branch 1.2.2.2 acqui.simple/addbooks.pl Lines: 510 Main 1.9 Branch 1.5.2.1 installer.pl Lines: 558 Main 1.2 Branch 1.2.2.16 admin/branches.pl Lines: 648 Main 1.2 Branch 1.1 marc/marcschema.sql Lines: 649 Main 1.14 Branch 1.2 C4/Search.pm Lines: 805 Main 1.29 Branch 1.18.2.3 C4/Circulation/Circ2.pm Lines: 947 Main 1.28 Branch 1.21.2.1 C4/Acquisitions.pm Lines: 979 Main 1.18 Branch 1.5.2.10 ChangeLog Lines: 1256 Main 1.1 Branch 1.1.2.5 circ/circulation.pl Lines: 1386 Main 1.31 Branch 1.23 C4/Catalogue.pm Lines: 1748 Main 1.19 Branch 1.11.2.1 C4/Biblio.pm Lines: 1921 Main 1.1 Branch 1.1.2.1 ========================================================================