summaryrefslogtreecommitdiff
path: root/xdiff/xmacros.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:17 -0700
commit9eb765d5f400aa922a46f1727259ce114b78561c (patch)
tree74247dd2328d3151340ae632b9ac5dd7e83e3ed4 /xdiff/xmacros.h
parentMerge branch 'fk/make-auto-header-dependencies' (diff)
parentgit-stash: remove untracked/ignored directories when stashed (diff)
downloadtgif-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 'xdiff/xmacros.h')
0 files changed, 0 insertions, 0 deletions