diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-02 23:02:15 -0500 |
---|---|---|
committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-02 23:02:15 -0500 |
commit | 59445b0b02c731872c8665ac7e9cf1226fa616e4 (patch) | |
tree | 93922cf13ed9c62859dac628fa7e376977a23d24 /xdiff/xdiff.h | |
parent | Revert "t0081 (line-buffer): add buffering tests" (diff) | |
parent | Git 1.7.5 (diff) | |
download | tgif-59445b0b02c731872c8665ac7e9cf1226fa616e4.tar.xz |
Merge commit 'v1.7.5' into svn-fe
* commit 'v1.7.5': (436 commits)
Git 1.7.5
Git 1.7.5-rc3
Git 1.7.4.5
git-svn.txt: Document --mergeinfo
Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
...
Diffstat (limited to 'xdiff/xdiff.h')
0 files changed, 0 insertions, 0 deletions