Y
Hacker News
new
|
ask
|
show
|
jobs
by
bitwave
3092 days ago
I use mostly
https://github.com/mhagger/git-imerge
for complex merges. imerge + meld is wonderful...