Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward: Use 'fast-forward' all over the place Conflicts: builtin-merge.c
Junio C Hamano committed
Nov 15, 2009 at 16:41 UTC
4d8c3258880548510b1d23f0db517adb7dfd2486
No changes.