git-merge: warn when -m provided on a fast forward
[gitweb.git] / merge-index.c
2005-09-08 Big tool rename.