OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b433e4
c3d51cd
)
Merge branch 'pr/mergetool'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 9 Dec 2007 09:01:50 +0000
(
01:01
-0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 9 Dec 2007 09:01:50 +0000
(
01:01
-0800)
* pr/mergetool:
Open external merge tool with original file extensions for all three files
Trivial merge