diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 11:36:42 -0700 |
| commit | fcbf164fcbf4110c7e2f96356d6707d56ba44ba4 (patch) | |
| tree | 990a0d029b85047a72b54bcc7846acccd7b6bb9d /merge-recursive.h | |
| parent | Merge branch 'dm/color-palette' (diff) | |
| parent | stash: fix false positive in the invalid ref test. (diff) | |
| download | tgif-fcbf164fcbf4110c7e2f96356d6707d56ba44ba4.tar.xz | |
Merge branch 'jk/maint-stash-oob'
* 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 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions