Add a merge hook. Handle the situations like:
[smatch.git] / gvpr / 
tree168fd5bc0f8def34efa3d1761ee7eb64578689f5
drwxr-xr-x   ..
-rwxr-xr-x 2143 return-paths
-rwxr-xr-x 1639 subg-fwd
-rwxr-xr-x 1943 subg-rev