]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34698ba f54bea4)
Merge branch 'nd/remote-plural-ours-plus-theirs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:24 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:24 +0000 (14:38 -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

diff --cc remote.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.