1) applyChange can ignore sha1 and size 2) added mergeChangeLine(), contentConflict()
1) applyChange can ignore sha1 and size
2) added mergeChangeLine(), contentConflict()

sassoftware/conary,sassoftware/conary,sassoftware/conary,sassoftware/conary,sassoftware/conary