summaryrefslogtreecommitdiff
path: root/t/t1013
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-03 15:36:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-03 15:36:30 -0700
commit15afe9596c101d00085830c54fdc4c4ad0b7193e (patch)
tree355012e6a3d7a8b3c1c69b3f1ae2c1708ba4dbb0 /t/t1013
parentMerge branch 'an/diff-index-doc' into maint (diff)
parentDocumentation/merge-options.txt: restore `-e` option (diff)
downloadtgif-15afe9596c101d00085830c54fdc4c4ad0b7193e.tar.xz
Merge branch 'rh/merge-options-doc-fix' into maint
* rh/merge-options-doc-fix: Documentation/merge-options.txt: restore `-e` option
Diffstat (limited to 't/t1013')
0 files changed, 0 insertions, 0 deletions