Improve language in git-merge.txt and related docs
[git/mingw.git] / perl / 
treea5c0fa8fdaa3b11a8e39c893add245c088c9597b
drwxr-xr-x   ..
-rw-r--r-- 47 .gitignore
-rw-r--r-- 35551 Git.pm
-rw-r--r-- 1391 Makefile
-rw-r--r-- 745 Makefile.PL
-rw-r--r-- 19088 private-Error.pm