Token is probably is probably a better word. Character, word, what-have-you--a symbol could be different different depending the filetype. If the filetype was .js a symbol would be function for example. This type of knowledge, instead of a line based diff, would def help avoid merge conflicts.
(At the cost of having to create tokenizers for every mime type evar!)