diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
| commit | 1a9fe453263137be7d42e6fbfc041b5b2d9521d7 (patch) | |
| tree | 5d55b038cada0490cbf7aa69da76c7b6255de58e /rerere.c | |
| parent | Merge branch 'jc/unpack-trees' (diff) | |
| parent | Exhibit merge bug that clobbers index&WT (diff) | |
| download | tgif-1a9fe453263137be7d42e6fbfc041b5b2d9521d7.tar.xz | |
Merge branch 'tr/merge-unborn-clobber'
* tr/merge-unborn-clobber:
Exhibit merge bug that clobbers index&WT
Conflicts:
t/t7607-merge-overwrite.sh
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions