summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-01-03Update goreleaser filev1.0.2Mike JS. Choi
2018-01-03Remove unused diffpatch library from godepMike JS. Choi
2018-01-03Fix consecutive error handling logicMike JS. Choi
2018-01-03Remove old diff toggle logicMike JS. Choi
2018-01-03Move indicator arrow to leftMike JS. Choi
2018-01-03Merge branch 'master' of https://github.com/mkchoi212/facMike JS. Choi
2018-01-03Merge pull request #16 from eduardomoroni/patch-1Mike JS. Choi
2018-01-03missing brew installEduardo Moroni
2018-01-02Print newline when printing error message on exitMike JS. Choi
2018-01-02Merge pull request #11 from chrissrogers/patch-1Mike JS. Choi
2018-01-02Updates Homebrew formula SHA256 for v1.0.1Christopher Rogers
2018-01-02Remove redundant homebrew scriptMike JS. Choi
2018-01-02fac version v1.0.1Mike Choi
2018-01-02fac version v1.0.1Mike Choi
2018-01-02fac version v1.0.1v1.0.1Mike Choi
2018-01-02Move homebrew formula script to Formula dirMike JS. Choi
2018-01-02Avoid formatting diff outputLeon Klingele
2018-01-02Update wording: Use 'local/remote version' instead of 'left/right screen'Leon Klingele
2018-01-02Update README with brew tap formulaMike JS. Choi
2018-01-02Merge branch 'master' of https://github.com/mkchoi212/facMike JS. Choi
2018-01-02fac version v1.0.0Mike Choi
2018-01-02Add .goreleaser.ymlv1.0.0Mike JS. Choi
2018-01-02Add dist to gitignoreMike JS. Choi
2018-01-01Add basic tests for conflict structMike JS. Choi
2018-01-01Rename variablesMike JS. Choi
2018-01-01Merge pull request #1 from md2perpe/patch-1Mike JS. Choi
2018-01-01Use normal switch casesPer Persson
2018-01-01Change check mark from emoji to simple txtMike JS. Choi
2018-01-01Update READMEMike JS. Choi
2018-01-01Create assets folderMike JS. Choi
2018-01-01Replace dummy paths with cwdMike JS. Choi
2018-01-01Add basic diff command fileMike JS. Choi
2018-01-01Fix minor bugsMike JS. Choi
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