Follow up to r8390:
Follow up to r8390:

* tools/client-side/bash_completion
  (merge): Now takes '--ignore-ancestry' instead of '--notice-ancestry'.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@848524 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion