Merge branch 'jk/merge-one-file-working-tree'
* jk/merge-one-file-working-tree: merge-one-file: fix broken merges with alternate work trees add tests for merge-index / merge-one-file
Junio C Hamano committed
May 6, 2011 at 10:54 UTC
ac13e7c514d6790cc59041545f26b3f5da543b25
No changes.