Junio C Hamano 8e17b34c33 Merge branch 'nd/resolve-ref' into next ...

* 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-11-18 14:20:03 -08:00

53 KiB

Raw Blame History

View Raw