CM6 Diff/Merge Editor Example

v6
4

See also this thread.