| commit | 38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8 | |
| author | Mihai Capotă <mihai@mihaic.ro> | |
| Wed, 27 Mar 2013 11:04:51 +0000 (27 12:04 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 16:30:54 +0000 (27 09:30 -0700) | ||
| tree | f58fec05f8413290bca1e78b87643ae36204f4d5 | treesnapshot (tar.gz zip) |
| parent | e39c695d871d877a621e39cef7e5bd208bb7b157 | commitdiff |
git-pull doc: fix grammo ("conflicts" is plural)
Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-pull.txt | diffblobblamehistory |