builtin-merge: show user-friendly error messages for fast-forward too.
[git/git-svn.git] / contrib / buildsystems / 
treee95ec4aa8a25d5eb0094abd3bde51bf2226d90ee
drwxr-xr-x   ..
-rw-r--r-- 1100 Generators.pm
drwxr-xr-x - Generators
-rw-r--r-- 10867 engine.pl
-rw-r--r-- 1208 generate
-rw-r--r-- 6675 parse.pl