summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-01-01Change background color when conflict is resolvedMike JS. Choi
2018-01-01Remove diff option for nowMike JS. Choi
2017-12-31Fix odd height and refactor title formatMike JS. Choi
2017-12-31Change default view orientation and edit helpMike JS. Choi
2017-12-31Add next/prev conflict keyboard shortcutsMike JS. Choi
2017-12-31Remove unncessary variableMike JS. Choi
2017-12-31Major refactoring to go with seperated packagesMike JS. Choi
2017-12-31Create vendor directory with godepMike JS. Choi
2017-12-31Add conlfict and color to importsMike JS. Choi
2017-12-31Seperate conflict as seperate packageMike JS. Choi
2017-12-31Seperate color as seperate packageMike JS. Choi
2017-12-31Create Godeps folderMike JS. Choi
2017-12-31Minor variable name changesMike JS. Choi
2017-12-31Fix consecutive error help displaying code blockMike JS. Choi
2017-12-31Refactor Find functionMike JS. Choi
2017-12-31Delete old git.go fileMike JS. Choi
2017-12-31Add command file to handle os.Exec related functionsMike JS. Choi
2017-12-31Fix diff newline errorMike JS. Choi
2017-12-30Add seperate file for calling gitMike JS. Choi
2017-12-30Handle no conflict errorMike JS. Choi
2017-12-30Finish intial version of FinalizeChangesMike JS. Choi
2017-12-30Retain all newlines and carriage returns when parsing filesMike JS. Choi
2017-12-30Create first version of WriteChangesMike JS. Choi
2017-12-30Change bool Resolved conflict variable to Choice int variableMike JS. Choi
2017-12-30Add z for toggling diff viewMike JS. Choi
2017-12-30Print help when user has no idea what he/she is doingMike JS. Choi
2017-12-30Support multiple character inputsMike JS. Choi
2017-12-30Add j and k for scrolling up and downMike JS. Choi
2017-12-29Reorder functions in conflictMike JS. Choi
2017-12-29Refactor color formatting codeMike JS. Choi
2017-12-29Fix printing summary at the endMike JS. Choi
2017-12-29Add up and down scrolling to panel viewsMike JS. Choi
2017-12-29Add gray colorMike JS. Choi
2017-12-29Change string literals to const varsMike JS. Choi
2017-12-29Add q for quitMike JS. Choi
2017-12-29Print summary after application exitsMike JS. Choi
2017-12-29Define additional colors and stylesMike JS. Choi
2017-12-29Print help with input character hMike JS. Choi
2017-12-29Create colorize function for colored outputsMike JS. Choi
2017-12-29Update header imageMike JS. Choi
2017-12-29Quit application when all conflicts have been resolvedMike JS. Choi
2017-12-29Parse invalid input commandMike JS. Choi
2017-12-29Rename conflict to parseMike JS. Choi
2017-12-29Update README.md with license informationMike JS. Choi
2017-12-29Create LICENSEMike JS. Choi
2017-12-29Update README.md with header imageMike JS. Choi
2017-12-29Move parse functionMike JS. Choi
2017-12-29Start handling enter key from input promptMike JS. Choi
2017-12-29Use color functionMike JS. Choi
2017-12-29Add color codeMike JS. Choi