rebase: implement --merge via the interactive machinery
[git] / t / t4256 /
drwxr-xr-x   ..
drwxr-xr-x - 1