diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-08-15 21:38:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-15 21:38:38 -0700 |
| commit | c576304d512df18fa30b91bb3ac15478d5d4dfb1 (patch) | |
| tree | a0be3b2ce5c20da4468433dfa6357c5357951e6f /xdiff/xdiff.h | |
| parent | Fix read-tree merging more than 3 trees using 3-way merge (diff) | |
| parent | GIT 1.5.2.5 (diff) | |
| download | tgif-c576304d512df18fa30b91bb3ac15478d5d4dfb1.tar.xz | |
Merge branch 'maint' to sync with 1.5.2.5
* maint:
GIT 1.5.2.5
git-add -u paths... now works from subdirectory
Fix "git add -u" data corruption.
Diffstat (limited to 'xdiff/xdiff.h')
0 files changed, 0 insertions, 0 deletions