diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-19 22:41:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-19 22:41:30 -0700 |
| commit | ddd02b70f0d80fc3cac6b2f2c42005560d572413 (patch) | |
| tree | 0bd6765c742b6622b6d81587b6ddd98d5062e9eb /t/t7605-merge-resolve.sh | |
| parent | Git 1.7.1-rc2 (diff) | |
| parent | t7012: Mark missing tests as TODO (diff) | |
| download | tgif-ddd02b70f0d80fc3cac6b2f2c42005560d572413.tar.xz | |
Merge branch 'maint'
* maint:
t7012: Mark missing tests as TODO
reflog: remove 'show' from 'expire's usage string
MSVC: Fix build by adding missing termios.h dummy
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions