git-pull doc: fix grammo ("conflicts" is plural)
authorMihai Capotă <mihai@mihaic.ro>
Wed, 27 Mar 2013 11:04:51 +0000 (12:04 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Mar 2013 16:30:54 +0000 (09:30 -0700)
commit38ef8a7...e7c8c3e1be6e6ae96cfccc4191e9eac8
treef58fec0...f8413290bca1e78b87643ae36204f4d5copy hash to clipboard (tree)
parente39c695...871d877a621e39cef7e5bd208bb7b157copy hash to clipboard (diff)
Documentation/git-pull.txt