projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7551391 5b32708)
Merge branch 'tr/merge-unborn-clobber'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
commit1a9fe453263137be7d42e6fbfc041b5b2d9521d7
tree5d55b038cada0490cbf7aa69da76c7b6255de58etree | snapshot
parent75513914784bb75447c71e3b001612ee37af386ccommit | diff
parent5b3270817712e8eedb468e906cb1042a5a311ad4commit | diff
Merge branch 'tr/merge-unborn-clobber'

* tr/merge-unborn-clobber:
  Exhibit merge bug that clobbers index&WT

Conflicts:
t/t7607-merge-overwrite.sh
t/t7607-merge-overwrite.sh diff1 | diff2 | blob | history
Git—the stupid content tracker