![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 5 Mar 2007 17:49:02 +0000 (12:49 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 5 Mar 2007 17:50:29 +0000 (12:50 -0500) | ||
| commit | 6b4318e604ca729d5d7508a744f0155555094fae | |
| tree | b8b65b5963737f9cd6663fc49fc6f902768b648a | tree | snapshot |
| parent | 5ced0572217f82f20c4a3460492768e07c08aeea | commit | diff |
| parent | 2f6dc35d2ad0bd2a8648902a692f087f47d1ee86 | commit | diff |
Merge branch 'maint'
* maint:
fast-import: Fail if a non-existant commit is used for merge
fast-import: Avoid infinite loop after reset
[sp: Minor evil merge to deal with type_names array moving
to be private in 'master'.]
* maint:
fast-import: Fail if a non-existant commit is used for merge
fast-import: Avoid infinite loop after reset
[sp: Minor evil merge to deal with type_names array moving
to be private in 'master'.]
| fast-import.c | diff1 | | diff2 | | blob | history |