Skip to content

Commit

Permalink
Use crlf when copying on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyriar committed Jun 29, 2017
1 parent 471e332 commit 4619937
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/SelectionManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import * as Browser from './utils/Browser';
import { CharMeasure } from './utils/CharMeasure';
import { CircularList } from './utils/CircularList';
import { EventEmitter } from './EventEmitter';
<<<<<<< Updated upstream
=======
import * as Mouse from './utils/Mouse';
import * as Browser from './utils/Browser';
>>>>>>> Stashed changes
import { ITerminal } from './Interfaces';
import { SelectionModel } from './SelectionModel';

Expand Down Expand Up @@ -233,7 +238,7 @@ export class SelectionManager extends EventEmitter {
// and joining the array into a multi-line string.
const formattedResult = result.map(line => {
return line.replace(ALL_NON_BREAKING_SPACE_REGEX, ' ');
}).join('\n');
}).join(Browser.isMSWindows ? '\r\n' : '\n');

return formattedResult;
}
Expand Down

0 comments on commit 4619937

Please sign in to comment.