git-pull doc: fix grammo ("conflicts" is plural)
Signed-off-by: NMihai Capotă <mihai@mihaic.ro> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
想要评论请 注册 或 登录
Signed-off-by: NMihai Capotă <mihai@mihaic.ro> Signed-off-by: NJunio C Hamano <gitster@pobox.com>