vimdiff: new implementation with layout support