github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into config

Browse Source 
Conflicts:
	src/app/keymap.coffee
	src/extensions/outline-view/src/keymap.coffee
	src/extensions/outline-view/src/tag-reader.coffee
	src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
	src/packages/fuzzy-finder/src/fuzzy-finder.coffee
This commit is contained in:
Nathan Sobo
2012-12-18 20:25:03 -07:00
parent 4ce8583cb2
commit acc0503684
24 changed files with 280 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/editor.coffee
View File

@@ -468,7 +468,7 @@ class Editor extends View
@resetDisplay()
if @attached and @activeEditSession.buffer.isInConflict()
@showBufferConflictAlert(@activeEditSession)
setTimeout(( =>@showBufferConflictAlert(@activeEditSession)), 0) # Display after editSession has a chance to display
showBufferConflictAlert: (editSession) ->
atom.confirm(