diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-05 02:58:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-05 02:58:14 -0700 |
| commit | b4196cf70a5fcd659fe334e5c03a416383f41985 (patch) | |
| tree | 82a8366ad6c2fd014caa3626ba0dd4f713226cff /Makefile | |
| parent | Merge branch 'nh/http' into next (diff) | |
| parent | Add git-clean command (diff) | |
| parent | combine-diff: refactor built-in xdiff interface. (diff) | |
| download | tgif-b4196cf70a5fcd659fe334e5c03a416383f41985.tar.xz | |
Merge branches 'master' and 'jc/combine' into next
* master:
Add git-clean command
diff_flush(): leakfix.
parse_date(): fix parsing 03/10/2006
* jc/combine:
combine-diff: refactor built-in xdiff interface.