[artlung]no that's what a patch looks like. note that is refers to some hashes there which may have some impact. think of a patch as a kind of merge. Some merges are clean, with no conflicts, some merges introduce a conflict because the code is too different to apply cleanly.
