Issues
- 1
Missing dependency in cabal package
#48 opened by Shachar - 0
Ubuntu package
#46 opened by Svalorzen - 0
Haskell stack error when installing on Ubuntu
#47 opened by Svalorzen - 9
Add to Homebrew
#36 opened by yairchu - 2
- 1
- 3
- 2
- 0
after configuring merge.conflictstyle automatically with -s, git-mediate causes parse error
#23 opened by eshels - 0
Merge of type-change (data->symlink) and data-change (data->data) handled incorrectly
#28 opened by Peaker - 0
- 0
- 0
Auto-reduce some conflicts
#34 opened by yairchu - 1
Handle modify/delete conflicts
#6 opened by ElastiLotem - 1
Trim diffs
#31 opened by yairchu - 1
Does not preserve file modes
#25 opened by wangp - 12
Resolve trivial whitespace conflicts
#9 opened by yairchu - 2
Installing Error
#26 opened by idkjs - 3
Windows support?
#17 opened by dglynch - 4
failure on conflict resolution during rebase
#20 opened by danra - 6
Cool github project subtitle
#15 opened by yairchu - 4
- 1
- 3
compile failure with GHC base<4.8
#14 opened by hvr - 8
Handle submodule conflicts
#5 opened by yairchu - 2
Warn if git merge.conflictstyle config is bad
#4 opened by yairchu - 1