Skip to main content

Browse the archive

Revision 8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af authored by Junio C Hamano on 13 May 2011, 17:44:19 UTC, committed by Junio C Hamano on 13 May 2011, 17:44:19 UTC 
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
2 parent s a613b53 + 6aaeca9
History
File Mode Size
.gitignore -rw-r--r-- 9 bytes
back to top