From: Michael Haggerty Date: Fri, 04 Dec 2009 14:36:28 GMT Subject: [PATCH 1/3] Better document the original repository layout. Message-ID: <91462ec5e4409e558ec5158b7dea33ebf0081d3e.1259934977.git.mhagger@alum.mit.edu> In-Reply-To: Signed-off-by: Michael Haggerty --- t/t3404-rebase-interactive.sh | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3a37793..073674f 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -16,13 +16,14 @@ set_fake_editor # set up two branches like this: # -# A - B - C - D - E +# A - B - C - D - E (master) # \ -# F - G - H +# F - G - H (branch1) # \ -# I +# I (branch2) # -# where B, D and G touch the same file. +# where B, D and G touch the same file. In addition, set tags at +# points A, F, and I. test_expect_success 'setup' ' : > file1 && -- 1.6.5.4