On 07/23/2010 03:15 AM, Johan Herland wrote:
+
+# Set up a notes merge scenario with all kinds of potential conflicts
+test_expect_success 'setup commits' '
+ # Create 15 commits with tags ("1st" through "15th")
+ :> a1&& git add a1&& test_tick&& git commit -m 1st&& git tag 1st&&
+ :> a2&& git add a2&& test_tick&& git commit -m 2nd&& git tag 2nd&&
+ :> a3&& git add a3&& test_tick&& git commit -m 3rd&& git tag 3rd&&
+ :> a4&& git add a4&& test_tick&& git commit -m 4th&& git tag 4th&&
+ :> a5&& git add a5&& test_tick&& git commit -m 5th&& git tag 5th&&
+ :> a6&& git add a6&& test_tick&& git commit -m 6th&& git tag 6th&&
+ :> a7&& git add a7&& test_tick&& git commit -m 7th&& git tag 7th&&
+ :> a8&& git add a8&& test_tick&& git commit -m 8th&& git tag 8th&&
+ :> a9&& git add a9&& test_tick&& git commit -m 9th&& git tag 9th&&
+ :> a10&& git add a10&& test_tick&& git commit -m 10th&& git tag 10th&&
+ :> a11&& git add a11&& test_tick&& git commit -m 11th&& git tag 11th&&
+ :> a12&& git add a12&& test_tick&& git commit -m 12th&& git tag 12th&&
+ :> a13&& git add a13&& test_tick&& git commit -m 13th&& git tag 13th&&
+ :> a14&& git add a14&& test_tick&& git commit -m 14th&& git tag 14th&&
+ :> a15&& git add a15&& test_tick&& git commit -m 15th&& git tag 15th
+'
Can you use test_commit here?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html