merge, pull: stop advising 'commit -a' in case of conflict
[git/mjg.git] / contrib / remote-helpers / 
treee3026f166de1362c0a84e121df3ddad941b5891a
drwxr-xr-x   ..
-rw-r--r-- 649 README
-rwxr-xr-x 497 git-remote-bzr
-rwxr-xr-x 491 git-remote-hg