Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 26 May 2016 20:17:18 +0000
(13:17 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 26 May 2016 20:17:18 +0000
(13:17 -0700)
Message fix.
* nd/remote-plural-ours-plus-theirs:
remote.c: specify correct plural form in "commit diverge" message
1
2
remote.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
e8c7b8c
f54bea4
)
diff --cc
remote.c
Simple merge