Merge branch 'softwrap' of github.com:github/atom into softwrap

Browse Source

Conflicts:
	spec/atom/line-wrapper-spec.coffee
	src/atom/line-wrapper.coffee

...

This commit is contained in:

Nathan Sobo

2012-02-09 13:28:10 -07:00

parent 6c0a0e4bd2 62cf65e7a9

commit 323fabf6a2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available