equal
deleted
inserted
replaced
316 > EOF |
316 > EOF |
317 diff --git a/plain b/plain |
317 diff --git a/plain b/plain |
318 1 hunks, 1 lines changed |
318 1 hunks, 1 lines changed |
319 examine changes to 'plain'? [Ynesfdaq?] y |
319 examine changes to 'plain'? [Ynesfdaq?] y |
320 |
320 |
321 @@ -9,3 +9,4 @@ |
321 @@ -9,3 +9,4 @@ 8 |
322 9 |
322 9 |
323 10 |
323 10 |
324 11 |
324 11 |
325 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
325 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
326 \ No newline at end of file |
326 \ No newline at end of file |
340 > EOF |
340 > EOF |
341 diff --git a/plain b/plain |
341 diff --git a/plain b/plain |
342 1 hunks, 1 lines changed |
342 1 hunks, 1 lines changed |
343 examine changes to 'plain'? [Ynesfdaq?] y |
343 examine changes to 'plain'? [Ynesfdaq?] y |
344 |
344 |
345 @@ -9,4 +9,4 @@ |
345 @@ -9,4 +9,4 @@ 8 |
346 9 |
346 9 |
347 10 |
347 10 |
348 11 |
348 11 |
349 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
349 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
350 \ No newline at end of file |
350 \ No newline at end of file |
385 2 |
385 2 |
386 3 |
386 3 |
387 4 |
387 4 |
388 record change 1/3 to 'plain'? [Ynesfdaq?] y |
388 record change 1/3 to 'plain'? [Ynesfdaq?] y |
389 |
389 |
390 @@ -8,5 +8,3 @@ |
390 @@ -8,5 +8,3 @@ 7 |
391 8 |
391 8 |
392 9 |
392 9 |
393 10 |
393 10 |
394 -11 |
394 -11 |
395 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
395 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
654 > EOF |
654 > EOF |
655 diff --git a/plain b/plain |
655 diff --git a/plain b/plain |
656 1 hunks, 2 lines changed |
656 1 hunks, 2 lines changed |
657 examine changes to 'plain'? [Ynesfdaq?] y |
657 examine changes to 'plain'? [Ynesfdaq?] y |
658 |
658 |
659 @@ -9,3 +9,5 @@ |
659 @@ -9,3 +9,5 @@ 6 |
660 7 |
660 7 |
661 8 |
661 8 |
662 9 |
662 9 |
663 +10 |
663 +10 |
664 +11 |
664 +11 |
944 old mode 100755 |
944 old mode 100755 |
945 new mode 100644 |
945 new mode 100644 |
946 1 hunks, 1 lines changed |
946 1 hunks, 1 lines changed |
947 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
947 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
948 |
948 |
949 @@ -2,3 +2,4 @@ |
949 @@ -2,3 +2,4 @@ a |
950 a |
950 a |
951 a |
951 a |
952 b |
952 b |
953 +c |
953 +c |
954 record this change to 'subdir/f1'? [Ynesfdaq?] y |
954 record this change to 'subdir/f1'? [Ynesfdaq?] y |
1377 > EOF |
1377 > EOF |
1378 diff --git a/subdir/f1 b/subdir/f1 |
1378 diff --git a/subdir/f1 b/subdir/f1 |
1379 1 hunks, 1 lines changed |
1379 1 hunks, 1 lines changed |
1380 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
1380 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
1381 |
1381 |
1382 @@ -3,3 +3,4 @@ |
1382 @@ -3,3 +3,4 @@ a |
1383 a |
1383 a |
1384 b |
1384 b |
1385 c |
1385 c |
1386 +d |
1386 +d |
1387 record this change to 'subdir/f1'? [Ynesfdaq?] y |
1387 record this change to 'subdir/f1'? [Ynesfdaq?] y |
1416 > EOF |
1416 > EOF |
1417 diff --git a/subdir/f1 b/subdir/f1 |
1417 diff --git a/subdir/f1 b/subdir/f1 |
1418 1 hunks, 1 lines changed |
1418 1 hunks, 1 lines changed |
1419 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
1419 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
1420 |
1420 |
1421 @@ -4,3 +4,4 @@ |
1421 @@ -4,3 +4,4 @@ a |
1422 b |
1422 b |
1423 c |
1423 c |
1424 d |
1424 d |
1425 +e |
1425 +e |
1426 record this change to 'subdir/f1'? [Ynesfdaq?] y |
1426 record this change to 'subdir/f1'? [Ynesfdaq?] y |
1447 rename from plain |
1447 rename from plain |
1448 rename to plain3 |
1448 rename to plain3 |
1449 1 hunks, 1 lines changed |
1449 1 hunks, 1 lines changed |
1450 examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y |
1450 examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y |
1451 |
1451 |
1452 @@ -11,3 +11,4 @@ |
1452 @@ -11,3 +11,4 @@ 8 |
1453 9 |
1453 9 |
1454 10 |
1454 10 |
1455 11 |
1455 11 |
1456 +somechange |
1456 +somechange |
1457 record this change to 'plain3'? [Ynesfdaq?] y |
1457 record this change to 'plain3'? [Ynesfdaq?] y |