Abstract: Methods and apparatus for annotating documents are disclosed. For example, a user of an electronic record management system may be viewing a document and/or metadata associated with a document offline, such as on a tablet device that does not necessarily have network connectivity. Prior to losing network connectivity, a saved search associated with a user profile is executed to retrieve a subset of documents. The subset of documents and associated metadata are then automatically downloaded to the portable electronic device. Subsequently, even if the device loses network connectivity (e.g., the user is on an airplane), the user may annotate documents. After network connectivity is restored, the documents and the annotated version of the documents are automatically synchronized, which may include merging the user's annotations with other user's annotations.

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.