aboutsummaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-20 12:12:18 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-20 12:12:18 -0800
commit407c8eb0d09d4b84bbfda9e04895a35c8fd6fef6 (patch)
treeadcc1c9a9794f69b21c5c39c9dd79520357df323 /t/t6021-merge-criss-cross.sh
parent29e4d3635709778bcc808dbad0477efad82f8d7e (diff)
downloadgit-407c8eb0d09d4b84bbfda9e04895a35c8fd6fef6.tar.gz
git-407c8eb0d09d4b84bbfda9e04895a35c8fd6fef6.tar.xz
Racy GIT (part #2)
The previous round caught the most trivial case well, but broke down once index file is updated again. Smudge problematic entries (they should be very few if any under normal interactive workflow) before writing a new index file out. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions