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:
0b65a8d
b5f325c
)
Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
author
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Sep 2016 14:16:29 +0000
(07:16 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Sep 2016 14:16:48 +0000
(07:16 -0700)
* 'rs/use-modern-git-merge-syntax' of git-gui:
git-gui: stop using deprecated merge syntax
1
2
git-gui/lib/merge.tcl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
git-gui/lib/merge.tcl
Simple merge