diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:46 -0800 |
| commit | cdc40bdb6973dacff521422c8cbb650be7148152 (patch) | |
| tree | 4c05b486faadd9d08d56d8e3ad35f4b25f3df537 /Documentation/git-merge.txt | |
| parent | Merge branch 'nd/negative-pathspec' (diff) | |
| parent | t7700: do not use "touch" unnecessarily (diff) | |
| download | tgif-cdc40bdb6973dacff521422c8cbb650be7148152.tar.xz | |
Merge branch 'jk/test-fixes'
* jk/test-fixes:
t7700: do not use "touch" unnecessarily
t7501: fix "empty commit" test with NO_PERL
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions