Abstract: A method is provided for merging first and second computer files wherein the first and second computer files are modified versions of a common computer file. The method comprises the steps of producing a first set of stacked diffs between the first computer file and the common computer file, producing a second set of stacked diffs between the second computer file and the common computer file, and simultaneously displaying the first and second sets of stacked diffs, wherein common lines of the first and second sets of stacked diffs are aligned and new lines of each of the first and second sets of stacked diffs are aligned with blank lines of the other stacked diff. Apparatus for performing the method and a computer readable medium including a computer program for performing the method are also included.

Abstract: A version controlled associative array is provided. A method of the invention includes providing a version control system on a computer, creating within the version control system an associative array comprising a collection of keys and corresponding values, applying a version control operation to the associative array to version control the collection of keys and corresponding values, and applying a version control operation to a collection of associative arrays, each viewed as a database record, and organized as a group of database tables forming a database. An apparatus, a computer system, and a computer readable medium pertaining to the version controlled associative array invention are also provided.