projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dee41f3
c4b4a5a
)
Merge branch 'master' of git://repo.or.cz/git/mergetool
author
Junio C Hamano
<junkio@cox.net>
Wed, 14 Mar 2007 08:13:39 +0000
(
01:13
-0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 14 Mar 2007 08:13:39 +0000
(
01:13
-0700)
* 'master' of git://repo.or.cz/git/mergetool:
Add git-mergetool to run an appropriate merge conflict resolution program
Trivial merge
projects / git.git / commitdiff