Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:18 +0000 (13:17 -0700)
committerJunio 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

diff --cc remote.c
Simple merge