rogerxu / git-tips

Tips for Git
Apache License 2.0
2 stars 3 forks source link

Diff/Merge Tool in Git Bash Command Line #10

Open rogerxu opened 8 years ago

rogerxu commented 8 years ago

Is there any good tool in Git bash command line when resolving merge conflicts?