diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-15 16:15:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-15 16:15:23 -0800 |
| commit | f2cb4004fd5b3ec4b11ad8ee6a374a55e9292732 (patch) | |
| tree | ec498f9c82262b683ec473aad5144bfc6f332a3c /blame.c | |
| parent | Merge branch 'lt/diff' into next (diff) | |
| parent | fix imap-send for OSX (diff) | |
| download | tgif-f2cb4004fd5b3ec4b11ad8ee6a374a55e9292732.tar.xz | |
Merge branch 'master' into next
* master:
fix imap-send for OSX
Let merge set the default strategy.
Diffstat (limited to 'blame.c')
0 files changed, 0 insertions, 0 deletions