aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4013/diff.diff_--stat_initial..side
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-12 13:24:48 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-12 13:24:48 -0700
commit02376287ffd8b37ea7622fd4b61d654855112e75 (patch)
tree012240009f9afed51301c938dae22c95ce3e72c7 /t/t4013/diff.diff_--stat_initial..side
parentMerge branch 'jc/combine' into next (diff)
parentMerge branch 'master' into jc/combine (diff)
downloadgit-02376287ffd8b37ea7622fd4b61d654855112e75.tar.gz
git-02376287ffd8b37ea7622fd4b61d654855112e75.zip
Merge branch 'jc/combine' into next
* jc/combine: stripspace: make sure not to leave an incomplete line. git-commit: do not muck with commit message when no_edit is set. When showing a commit message, do not lose an incomplete line. Retire t5501-old-fetch-and-upload test. combine-diff: type fix.
Diffstat (limited to 't/t4013/diff.diff_--stat_initial..side')
0 files changed, 0 insertions, 0 deletions