diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:17 -0700 |
| commit | 9eb765d5f400aa922a46f1727259ce114b78561c (patch) | |
| tree | 74247dd2328d3151340ae632b9ac5dd7e83e3ed4 /Documentation/git-difftool.txt | |
| parent | Merge branch 'fk/make-auto-header-dependencies' (diff) | |
| parent | git-stash: remove untracked/ignored directories when stashed (diff) | |
| download | tgif-9eb765d5f400aa922a46f1727259ce114b78561c.tar.xz | |
Merge branch 'bc/unstash-clean-crufts'
* bc/unstash-clean-crufts:
git-stash: remove untracked/ignored directories when stashed
t/t3905: add missing '&&' linkage
git-stash.sh: fix typo in error message
t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions