Matt Diephouse
|
9c7d3f97b6
|
Merge branch 'master' into belly-of-the-beast
# Conflicts:
# app/Main.hs
|
2016-02-02 11:58:59 -05:00 |
|
Rob Rix
|
0253560576
|
Merge pull request #413 from github/bring-em-back
Restore changes lost from #402, #408, and #410
|
2016-02-02 11:53:54 -05:00 |
|
Matt Diephouse
|
1f7df7d940
|
Remove unnecessary imports
|
2016-02-02 11:46:39 -05:00 |
|
Matt Diephouse
|
6a961ff6ff
|
Restore changes lost from #402, #408, and #410
|
2016-02-02 11:46:31 -05:00 |
|
Matt Diephouse
|
cda76aa6f5
|
Document Split.hs
|
2016-02-02 10:58:34 -05:00 |
|
Matt Diephouse
|
0e231b91b1
|
Rewrite split:numberRows
|
2016-02-02 10:05:45 -05:00 |
|
Matt Diephouse
|
9fe2bffc9a
|
Document Row.hs
|
2016-02-01 19:48:19 -05:00 |
|
Rob Rix
|
0dc4927c5e
|
Merge pull request #407 from github/git-diff
Diff a list of files in a given repository
|
2016-02-01 16:40:45 -05:00 |
|
Matt Diephouse
|
dc526788d6
|
Document Line.hs
|
2016-02-01 16:12:18 -05:00 |
|
joshvera
|
1b44c44aea
|
Revert "--RecordWildCards"
This reverts commit 74c1cd9b5dafc1ba38014d90097a2ac7a7b75c7c.
|
2016-02-01 15:52:17 -05:00 |
|
joshvera
|
ce87286049
|
--RecordWildCards
|
2016-02-01 15:50:22 -05:00 |
|
joshvera
|
724910bf7a
|
Merge remote-tracking branch 'origin/master' into git-diff
|
2016-02-01 14:48:30 -05:00 |
|
Rob Rix
|
444121f826
|
Merge pull request #411 from github/document-thy-functions-3
Document thy functions 3
|
2016-01-29 12:41:22 -05:00 |
|
Matt Diephouse
|
d76fbfa60e
|
No IO needed
|
2016-01-28 16:14:24 -05:00 |
|
Matt Diephouse
|
f9dd0e0080
|
Document Unified.hs
|
2016-01-27 17:38:46 -05:00 |
|
Matt Diephouse
|
139314bc3e
|
Merge branch 'master' into document-thy-functions-3
|
2016-01-27 14:47:26 -05:00 |
|
Josh Vera
|
cf1440a81c
|
Merge pull request #410 from github/unified
Clean up unified format and fix crash
|
2016-01-27 14:42:39 -05:00 |
|
Matt Diephouse
|
86c8bd9f2b
|
Don't sort these
|
2016-01-27 14:19:01 -05:00 |
|
Matt Diephouse
|
45de586389
|
Merge branch 'master' into unified
|
2016-01-22 11:04:53 -05:00 |
|
Josh Vera
|
0094490b31
|
Merge pull request #409 from github/line-by-line-crash
Fix off-by-one error
|
2016-01-22 11:03:42 -05:00 |
|
Matt Diephouse
|
0671d46590
|
Fix off-by-one error
|
2016-01-22 10:27:00 -05:00 |
|
Matt Diephouse
|
b4f6318e22
|
Cleanup
|
2016-01-21 14:58:42 -05:00 |
|
Matt Diephouse
|
316a7827c3
|
Add Rainbow to semantic-diff-exe
|
2016-01-21 13:32:00 -05:00 |
|
Matt Diephouse
|
b074325f67
|
Make unified into a Renderer of [Chunk String]
|
2016-01-21 13:27:16 -05:00 |
|
Matt Diephouse
|
a166c354e3
|
Reformat where clause
|
2016-01-21 13:05:51 -05:00 |
|
Matt Diephouse
|
80273c1fd4
|
Document unified
|
2016-01-21 13:05:25 -05:00 |
|
Matt Diephouse
|
160c2e309a
|
Pass the chunk renderer into unified
|
2016-01-21 13:05:15 -05:00 |
|
Matt Diephouse
|
bd74e7d971
|
Remove spurious blank line
|
2016-01-21 13:04:50 -05:00 |
|
Matt Diephouse
|
192dd7c5f9
|
Reformat where clause
|
2016-01-21 13:04:42 -05:00 |
|
Matt Diephouse
|
b8c7aaeccd
|
Document SES.hs
|
2016-01-21 10:29:52 -05:00 |
|
joshvera
|
b4dc0056ec
|
fix unused variable warning
|
2016-01-20 12:27:01 -05:00 |
|
joshvera
|
5fd539765c
|
Share printDiff
|
2016-01-20 12:25:17 -05:00 |
|
joshvera
|
3e72417c77
|
Move shared IO to DiffOutput
|
2016-01-20 11:43:31 -05:00 |
|
joshvera
|
b188febbe7
|
share diff and breakDownLeavesByWord between SemanticDiff and Main
|
2016-01-20 11:36:06 -05:00 |
|
joshvera
|
263ea09dd2
|
diff functions take tuples of sources now
|
2016-01-20 10:39:44 -05:00 |
|
Matt Diephouse
|
3637bfee24
|
Document Interpreter.hs
|
2016-01-19 13:51:17 -05:00 |
|
joshvera
|
99f8fb18a4
|
Revert main
|
2016-01-15 16:26:16 -05:00 |
|
joshvera
|
84d8494c3e
|
Add semantic-diff exe
|
2016-01-15 16:25:58 -05:00 |
|
joshvera
|
33b2331a23
|
Merge origin/master into git-diff
|
2016-01-15 16:15:44 -05:00 |
|
Josh Vera
|
fe472fc60c
|
Merge pull request #408 from github/extract-diff
Create a diff function and clarify the role of printDiff
|
2016-01-14 16:04:27 -05:00 |
|
Matt Diephouse
|
9e6e125477
|
Update the documentation
|
2016-01-14 15:31:20 -05:00 |
|
Matt Diephouse
|
140cfa88b6
|
Try to make the overall structure clearer
|
2016-01-14 15:27:47 -05:00 |
|
Matt Diephouse
|
55666a5586
|
Monadically
|
2016-01-14 15:13:26 -05:00 |
|
Matt Diephouse
|
61b65533ef
|
printDiff can return a Renderer now
|
2016-01-14 15:10:56 -05:00 |
|
Matt Diephouse
|
3a9803ee15
|
Make Renderer take a pair of Source Chars
|
2016-01-14 15:09:47 -05:00 |
|
Matt Diephouse
|
fa68f78c39
|
Put the diff first
|
2016-01-14 14:56:00 -05:00 |
|
Matt Diephouse
|
78852e4041
|
Get rid of the where clause
|
2016-01-14 14:54:43 -05:00 |
|
Matt Diephouse
|
44a1c68f8f
|
Create a separate diff function
|
2016-01-14 14:54:30 -05:00 |
|
joshvera
|
ac77ed1ba0
|
rename to Format
|
2016-01-14 14:08:23 -05:00 |
|
joshvera
|
13b676f392
|
Merge origin/master into git-diff
|
2016-01-14 14:04:28 -05:00 |
|