Junio C Hamano 8272bcabac Merge branch 'jk/merge-one-file-working-tree' into maint ...

* jk/merge-one-file-working-tree:
  merge-one-file: fix broken merges with alternate work trees
  add tests for merge-index / merge-one-file

2011-05-13 10:44:19 -07:00

3.8 KiB

Executable File

Raw Blame History

View Raw