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

3 Commits (fa21b6023288d5ee0afa79021493a199b1c9bac5)

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