Junio C Hamano d4dd59844e Merge branch 'jk/pull-into-empty' into next ...

* jk/pull-into-empty:
  pull: do not clobber untracked files on initial pull
  merge: merge unborn index before setting ref

Conflicts:
	builtin/merge.c

2011-03-31 13:13:58 -07:00

7.3 KiB

Executable File

Raw Blame History

View Raw