Junio C Hamano d55637f318 Merge branch 'nd/resolve-ref' into jch ...

* nd/resolve-ref:
  Copy resolve_ref() return value for longer use
  Convert many resolve_ref() calls to read_ref*() and ref_exists()

Conflicts:
	builtin/fmt-merge-msg.c
	builtin/merge.c
	refs.c

2011-12-05 22:46:57 -08:00

43 KiB

Raw Blame History

View Raw