5754 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	0b4696062d	Compute term sizes as node counts.	2016-04-11 13:54:46 -04:00
Rob Rix	4cce0deb34	Merge pull request #533 from github/async ... Asynchronously diff and timeout individual files	2016-04-04 17:40:55 -04:00
joshvera	928087e1f5	🔥	2016-04-04 17:38:58 -04:00
Rob Rix	f095c455a6	Merge branch 'master' into async	2016-04-04 17:31:05 -04:00
joshvera	a553709112	Specialize Renderer to Text	2016-04-04 17:20:26 -04:00
joshvera	3b752b834c	docs	2016-04-04 17:12:55 -04:00
joshvera	90013b1235	Rename printDiff to textDiff and printDiff' to printDiff	2016-04-04 17:08:29 -04:00
joshvera	506abacbc6	Document use of strictness in diffFiles	2016-04-04 17:03:35 -04:00
joshvera	ba8fef376a	move to where clause	2016-04-02 13:28:17 -04:00
joshvera	4512344e3a	update dictionary.json.js	2016-04-01 16:07:05 -04:00
joshvera	4a7004394b	fix tests	2016-04-01 15:53:16 -04:00
joshvera	cf898c66c6	Strictly render in diffFiles	2016-04-01 15:35:38 -04:00
joshvera	842a0f30af	Move emptyHunk to a function	2016-04-01 15:35:21 -04:00
joshvera	a18c2649d3	Add a truncatePatch function	2016-04-01 15:35:09 -04:00
joshvera	7947bc1911	Move DiffArguments to Renderer.hs	2016-04-01 15:34:52 -04:00
joshvera	e44b24806f	Merge remote-tracking branch 'origin/master' into async	2016-04-01 12:52:17 -04:00
Rob Rix	9fb057223f	Merge pull request #531 from github/one-header-per-file ... One header per file	2016-03-31 17:02:35 -04:00
Rob Rix	da3f04100e	Merge branch 'master' into one-header-per-file	2016-03-31 17:00:37 -04:00
joshvera	5ff0d38a2f	Make sure we actually show 2 hunks in the test	2016-03-31 13:53:47 -04:00
joshvera	4fafbda1de	Test multiple hunks only has one header	2016-03-31 13:20:14 -04:00
joshvera	b44c8fae38	Add jquery alignment test case	2016-03-31 13:11:46 -04:00
joshvera	f35b88eabd	One header per file	2016-03-31 12:31:28 -04:00
Josh Vera	042d2ce803	Merge pull request #530 from github/move-info-into-its-own-module ... Move info into its own module	2016-03-30 18:10:22 -04:00
Rob Rix	20bb94bf5e	Also, tests.	2016-03-30 17:33:07 -04:00
Rob Rix	e8fbe8c789	Move Info into its own module.	2016-03-30 17:26:52 -04:00
Rob Rix	75677fa8aa	Add a module for Info.	2016-03-30 17:12:39 -04:00
joshvera	4b046e6f4e	Return IO Text from printDiff	2016-03-28 13:31:10 -04:00
Rob Rix	d16c4bfe82	Merge pull request #523 from github/add-atom-build-config ... Add atom-build config	2016-03-18 10:38:28 -04:00
Rob Rix	9ec169e3df	Add a regexp to match errors.	2016-03-18 10:34:41 -04:00
Rob Rix	e36d4f470f	We don’t have to quote stuff in YAML.	2016-03-18 10:24:54 -04:00
Rob Rix	ac98bacb4d	What is this even for?	2016-03-18 10:20:16 -04:00
Rob Rix	4e4e8f66f5	Add a keymap for the tests.	2016-03-18 10:18:39 -04:00
Rob Rix	3289ea187c	Add the git integration as a target.	2016-03-18 10:18:33 -04:00
Rob Rix	3dcd34e04f	Add the difftool as a target.	2016-03-18 10:18:27 -04:00
Rob Rix	6ccc15a0b7	Add the tests as a target.	2016-03-18 10:18:20 -04:00
Rob Rix	a3b837da31	Add a reasonable PATH (I guess?).	2016-03-18 10:17:56 -04:00
Rob Rix	3b7fbd198a	Name the default target.	2016-03-18 10:17:42 -04:00
Rob Rix	f42f999b67	Stub in an atom-build config file.	2016-03-18 10:15:52 -04:00
Rob Rix	3c60d111af	Merge pull request #522 from github/fix-filemode-change-header ... Fix filemode change header	2016-03-17 14:15:23 -04:00
Josh Vera	666b56b713	Merge branch 'master' into fix-filemode-change-header	2016-03-17 14:12:38 -04:00
joshvera	190729a156	fmap null over sources and check that they're both null	2016-03-17 14:12:25 -04:00
Rob Rix	00da8bc641	Merge pull request #520 from github/fix-deleted-file-mode-header ... Fix deleted file mode header format	2016-03-17 14:08:14 -04:00
joshvera	cdd96b2deb	blobOidHeader should be on a new line if there's a mode change	2016-03-17 13:58:49 -04:00
joshvera	77f7b8ff02	Use the empty hunk if the sources are equal	2016-03-17 13:51:52 -04:00
joshvera	98c0242056	add a space after old mode	2016-03-17 13:51:38 -04:00
joshvera	339c0c5376	s/old/deleted	2016-03-17 13:11:14 -04:00
Rob Rix	1a55c8c750	Merge pull request #518 from github/end-with-newline ... Check if the patch ends with a newline	2016-03-16 19:01:20 -04:00
joshvera	2d711d2a56	just one slash	2016-03-16 18:56:57 -04:00
joshvera	c7aeec0e0e	unindent	2016-03-16 18:41:56 -04:00
joshvera	739cc3ad91	unindent	2016-03-16 18:38:56 -04:00