summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-01-07Make input prompt parse inputs without enterno-enterMike JS. Choi
2018-01-06fac version v1.0.4Mike Choi
2018-01-06Adjust scroll up behaviorv1.0.4Mike JS. Choi
2018-01-06Add warning message for unsupported diff3 conflict styleMike JS. Choi
2018-01-06Change function nameMike JS. Choi
2018-01-06Update README about diff3 supportMike JS. Choi
2018-01-05fac version v1.0.3Mike Choi
2018-01-05Update size of prompt panel to fit new prompt stringv1.0.3Mike JS. Choi
2018-01-05Update prompt string with a question markMike JS. Choi
2018-01-05Add additional edge case for when there are no conflictsMike JS. Choi
2018-01-04Merge pull request #20 from shogo-ma/iotaMike JS. Choi
2018-01-04Merge pull request #19 from xyproto/emojiMike JS. Choi
2018-01-04use iota identifiershogo-ma
2018-01-04Add missing emojiAlexander F Rødseth
2018-01-03Update LICENSE year :)Mike JS. Choi
2018-01-03Merge branch 'master' of https://github.com/mkchoi212/facMike JS. Choi
2018-01-03fac version v1.0.2Mike Choi
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