diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-22 07:29:21 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 10:01:21 -0800 |
commit | 0ecace728f8e48b87f81433b053d7f277f22e674 (patch) | |
tree | bb7fba5beef76521154779bc8aa90c0dbe59ddd9 /diff.h | |
parent | 07c073206798483c9916d492dfc6faf7400a50ad (diff) | |
download | git-0ecace728f8e48b87f81433b053d7f277f22e674.tar.gz git-0ecace728f8e48b87f81433b053d7f277f22e674.tar.xz |
make "merge-index" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions