completion: fix PS1 display during a merge on detached HEAD
[gitweb.git] / xdiff / xmacros.h
2006-03-26 Merge branch 'lt/diffgen' into next
2006-03-26 Use a *real* built-in diff generator