diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-05 13:58:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-05 13:58:14 +0400 |
| commit | b4196cf70a5fcd659fe334e5c03a416383f41985 (patch) | |
| tree | 82a8366ad6c2fd014caa3626ba0dd4f713226cff /Makefile | |
| parent | 110cb41cbf7b7cfefdc1f9fab521f165dd1d5d00 (diff) | |
| parent | c3b831bd84320374834f9984c118cb4fc7050ebc (diff) | |
| parent | d9ea73e0564c7db8d791fe6b03c976ce57c9b079 (diff) | |
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.