Only fast-forward if local repository is not a child of remote repository.
Only fast-forward if local repository is not a child of remote repository.

git-svn-id: d7aa117ce1b65012fb6ddbf5dfb3ef5e938fe470@190 57e68679-7564-4017-a3af-2a4836dcd6fc

certain/certain,certain/certain