diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:58:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:58:42 -0700 |
commit | be44a20aa88b196b769dd894c0ac7a9ff5a7a1f6 (patch) | |
tree | f624a14245eb53774ec0443b5dbf0f7fd0fd1149 /t/t7609-merge-co-error-msgs.sh | |
parent | Merge branch 'jk/maint-upload-pack-shallow' into maint (diff) | |
parent | stash: fix false positive in the invalid ref test. (diff) | |
download | tgif-be44a20aa88b196b769dd894c0ac7a9ff5a7a1f6.tar.xz |
Merge branch 'jk/maint-stash-oob' into maint
* jk/maint-stash-oob:
stash: fix false positive in the invalid ref test.
stash: fix accidental apply of non-existent stashes
Conflicts:
t/t3903-stash.sh
Diffstat (limited to 't/t7609-merge-co-error-msgs.sh')
0 files changed, 0 insertions, 0 deletions