v1.0.0
Changelog
298d7e6 Add .goreleaser.yml
cf0cb23 Add dist to gitignore
de61c39 Add basic tests for conflict struct
46dd5b9 Rename variables
bf900e3 Merge pull request #1 from md2perpe/patch-1
369f520 Use normal switch cases
eccb198 Change check mark from emoji to simple txt
38f82ee Update README
aa7da56 Create assets folder
a7bcc41 Replace dummy paths with cwd
8f4df34 Add basic diff command file
a17f24e Fix minor bugs
66122fe Change background color when conflict is resolved
6fd77f4 Remove diff option for now
f94e86c Fix odd height and refactor title format
532d3c9 Change default view orientation and edit help
fbe44e5 Add next/prev conflict keyboard shortcuts
a3fceef Remove unncessary variable
41a8085 Major refactoring to go with seperated packages
47c5922 Create vendor directory with godep
97cd90d Add conlfict and color to imports
b11a1b9 Seperate conflict as seperate package
2cbb1cd Seperate color as seperate package
6ffb5b1 Create Godeps folder
4b11691 Minor variable name changes
21634e1 Fix consecutive error help displaying code block
58cd719 Refactor Find function
ac1123b Delete old git.go file
4ee25ec Add command file to handle os.Exec related functions
7456d0a Fix diff newline error
7068c59 Add seperate file for calling git
2e3a0b7 Handle no conflict error
4dd10fd Finish intial version of FinalizeChanges
b7b7aa5 Retain all newlines and carriage returns when parsing files
131da5d Create first version of WriteChanges
28a354a Change bool Resolved conflict variable to Choice int variable
93fde8a Add z for toggling diff view
f153931 Print help when user has no idea what he/she is doing
d04835e Support multiple character inputs
fb15258 Add j and k for scrolling up and down
1a90d93 Reorder functions in conflict
b028aea Refactor color formatting code
873a977 Fix printing summary at the end
1e38e63 Add up and down scrolling to panel views
e3e9f54 Add gray color
0a548c6 Change string literals to const vars
41b4847 Add q for quit
cc25b6d Print summary after application exits
f617cdb Define additional colors and styles
2cc0fd2 Print help with input character h
e27a37f Create colorize function for colored outputs
43293a7 Update header image
3d14515 Quit application when all conflicts have been resolved
e28b544 Parse invalid input command
33bd902 Rename conflict to parse
b8b302f Update README.md with license information
2db2786 Create LICENSE
4b4547c Update README.md with header image
d339a1b Move parse function
6ea3727 Start handling enter key from input prompt
e4d7bc3 Use color function
b023acc Add color code
6d16fc2 Fix enter input behavior
b782e6c Seperate layout code
300358a Create layout for command prompt
2fc3f18 Create custom editor class for the prompt
4faa632 Add diffing library
84cfcee Add glide.yaml
7151bee Print highlighted versions of code
7810a0b Add file detection and colorized output
162b566 Enable swtiching between multiple conflicts
da7adc8 Properly parse multiple conflicts from a single file
02788e7 Update gitignore with things from vscode
5c80934 Print basic conflict data to screen
3a2c7f4 Complete parsing and constructing array of conflicts
b895d68 Add call to conflict.go
0f6039a Add call to git diff --check and basic output parsing function
4c83e3e Initial commit
Automated with GoReleaser
Built with go version go1.9.2 darwin/amd64