travi / dotfiles

My disaster recovery plan.
21 stars 6 forks source link

add indicator to prompt for resolving merge conflicts #79

Closed travi closed 9 years ago

travi commented 9 years ago

both modified: