"git-merge": allow fast-forwarding in a stat-dirty tree