Junio C Hamano 23807fa008 Merge branch 'maint' ...

* maint:
  Prepare for 1.6.3.2
  fix cat-file usage message and documentation
  fetch: report ref storage DF errors more accurately
  lock_ref: inform callers of unavailable ref
  merge-options.txt: Clarify merge --squash

Conflicts:
	RelNotes

2009-05-25 19:44:52 -07:00

42 KiB

Raw Blame History

View Raw