composeConflict() takes the hashes of two versions of the same file and returns a string that represents the two versions as a conflicted file:

<<<<< version1 ====== version2 >>>>>

Note that Gitlet, unlike real Git, does not do a line by line diff and mark only the conflicted parts of the file. If a file is in conflict, the whole body of the file is marked as one big conflict.