Issues
- 2
switch from dep to Go modules
#55 opened by katexochen - 0
Links comes out as black in terminal
#53 opened by bep - 0
Status
#52 opened by bashfulrobot - 0
View previous conflict resolution
#51 opened by abitrolly - 1
- 0
help isn't shown
#49 opened by abitrolly - 1
"Parent of" sticks around after resolving conflict
#42 opened by alok - 2
Remove emojis from output messages
#40 opened by lenormf - 3
Crash while resolving large number of conflicts
#46 opened by elsbrock - 3
- 0
b for both
#43 opened by mkchoi212 - 0
Syntax highlighting doesn't seem to work
#41 opened by alok - 5
Long list of conflicts hide the help
#5 opened by hkdobrev - 13
Feature Request: Change key binds
#29 opened by pylebecq - 2
Persist view option
#15 opened by hkdobrev - 20
- 3
- 15
What about `e` to edit or `o` to open
#30 opened by stoivo - 2
Console color doesn't work on windows
#13 opened by itsnotvalid - 6
Support for git-mergetool
#4 opened by hkdobrev - 2
- 5
Invalid number of conflict markers
#12 opened by achikin - 0
Write tests for conflict package
#2 opened by mkchoi212 - 0
Replace Godeps directory with dep
#32 opened by mkchoi212 - 4
Build error
#25 opened by Aethelflaed - 1
cannot execute binary file: Exec format error
#23 opened by Tchoupinax - 2
Long filenames hide the current file marker
#14 opened by hkdobrev - 1
brew installation issue
#10 opened by achikin - 3
brew tap command doesn't find any formulae
#9 opened by horo42 - 8
Unclear how to actually resolve the conflict
#6 opened by ddevault - 0
Support editing code
#3 opened by mkchoi212