X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-export.sh;h=5b7794c2470e0b5badbcbd1af55f5c6eb347ae9f;hb=b725fc951a37854fc65945ac5bcab3bc61ccbd94;hp=37cd9cdd11f1a230a7d4c2ac08e1bc920afae160;hpb=6745b3c106485f5607d7e1e6251878d429591186;p=topgit.git

diff --git a/tg-export.sh b/tg-export.sh
index 37cd9cd..5b7794c 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -231,6 +231,7 @@ linearize()
 		git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
 
 		if test "x$retmerge" != "x0"; then
+			git rerere;
 			echo "fix up the merge and update the index.  Don't commit!"
 			#todo error handling
 			sh -i </dev/tty;