Merge branch 'jk/test-framework-updates' into pu

* jk/test-framework-updates:
  t0000: drop "known breakage" test
  t0000: simplify HARNESS_ACTIVE hack
  t0000: set TEST_OUTPUT_DIRECTORY for sub-tests
Merge branch 'js/lift-parent-count-limit' into pu

* js/lift-parent-count-limit:
  Remove the line length limit for graft files
Merge branch 'bm/merge-base-octopus-dedup' into pu

* bm/merge-base-octopus-dedup:
  merge-base --octopus: reduce the result from get_octopus_merge_bases()
  merge-base: separate "--independent" codepath into its own helper

# Conflicts:
# 	builtin/merge-base.c
# 	t/t6010-merge-base.sh
Merge branch 'jc/graph-post-root-gap' into pu

This was primarily a RFH ($gmane/239580).

* jc/graph-post-root-gap:
  WIP: document what we want at the end
  graph: remove unused code a bit
  graph: stuff the current commit into graph->columns[]
Merge branch 'ap/remote-hg-skip-null-bookmarks' into pu

* ap/remote-hg-skip-null-bookmarks:
  remote-hg: do not fail on invalid bookmarks
Merge branch 'bs/mirbsd' into pu

* bs/mirbsd:
  Add MirBSD support to the build system.
Merge branch 'jk/credential-plug-leak' into pu

* jk/credential-plug-leak:
  Revert "prompt: clean up strbuf usage"
Merge branch 'jk/http-auth-tests-robustify' into pu

* jk/http-auth-tests-robustify:
  use distinct username/password for http auth tests
Merge branch 'km/gc-eperm' into pu

* km/gc-eperm:
  HOLD: needs sign-off
  gc: notice gc processes run by other users
Merge branch 'ss/builtin-cleanup' into pu

* ss/builtin-cleanup:
  Speed up is_git_command() by checking early for internal commands
  Call load_command_list() only when it is needed
  Consistently use the term "builtin" instead of "internal command"
Merge branch 'ss/safe-create-leading-dir-with-slash' into pu

* ss/safe-create-leading-dir-with-slash:
  Fix safe_create_leading_directories() for Windows

Conflicts:
	sha1_file.c