Patent ID: 6848078

Claim:
A method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of: comparing the elements of a base file to the elements of a modified file; displaying to the user a tree structure, said tree structure combining the elements of said base and said modified files; highlighting, in the tree structure, the differences between said elements of said base and said modified files; allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file; indicating to the user, in the tree structure, differences between elements by one of the identifiers: new, changed or removed; and for an element identified as new, providing the user with the following options: a) do not use the new element, whereby the new element is not incorporated into said merged file; and b) use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file.