kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
9067 Commits
6 Branches
36 Tags
131 MiB
Tree: 3358004a00
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '3358004a00'
${ noResults }
Commit Graph

3 Commits (3358004a006714477c2c44577507081cb5124fa4)

Author SHA1 Message Date
Theodore Ts'o d6678c28e3 mergetool: print an appropriate warning if merge.tool is unknown
18 years ago
James Bowes 9cec65399d mergetool: Add support for vimdiff.
18 years ago
Theodore Ts'o c4b4a5af16 Add git-mergetool to run an appropriate merge conflict resolution program
18 years ago