saltstack/salt — pull request #6907 by shadowfax-chc (2013-08-26 21:30:37+00:00)
Title: Added bookmark support to hgfs.

Added new option to hgfs ``hgfs_branch_method``. If set to ``branches``,
bookmarks will be ignored. If set to ``bookmarks`` branches will be
ignored. If set to ``mixed`` both will be used.