Thomas Harning wrote: > diff --git a/git-merge-ours.sh b/git-merge-ours.sh > deleted file mode 100755 > index c81a790..0000000 > --- a/git-merge-ours.sh > +++ /dev/null Shouldn't script version be moved to contrib/examples/ as is git.git policy, or is it too simple script? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html