[PATCH] Add a t/t6001 test case for a --merge-order bug

[git] / git-reset-script

#!/bin/sh
: ${GIT_DIR=.git}
git-read-tree --reset HEAD
git-update-cache --refresh
rm -f "$GIT_DIR/MERGE_HEAD"