Commit Briefs
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam. ok tracey
add fd field to got_worktree, modify got_fileindex_entry_update to use fds
These changes are intended to make got more compatible with FreeBSD's Capsicum. ok stsp