mirror of
https://github.com/Aider-AI/aider.git
synced 2025-06-01 02:05:00 +00:00
cleanup
This commit is contained in:
parent
5aebad9198
commit
4a8c4af902
1 changed files with 6 additions and 6 deletions
|
@ -19,7 +19,7 @@ aider/coder.py
|
||||||
>>>>>>> UPDATED
|
>>>>>>> UPDATED
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```python
|
||||||
aider/coder.py
|
aider/coder.py
|
||||||
<<<<<<< ORIGINAL
|
<<<<<<< ORIGINAL
|
||||||
self.console.print("[red]No suitable git repo, will not automatically commit edits.")
|
self.console.print("[red]No suitable git repo, will not automatically commit edits.")
|
||||||
|
@ -28,7 +28,7 @@ aider/coder.py
|
||||||
>>>>>>> UPDATED
|
>>>>>>> UPDATED
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```python
|
||||||
aider/coder.py
|
aider/coder.py
|
||||||
<<<<<<< ORIGINAL
|
<<<<<<< ORIGINAL
|
||||||
self.console.print("[red]Files are not in a git repo.")
|
self.console.print("[red]Files are not in a git repo.")
|
||||||
|
@ -37,7 +37,7 @@ aider/coder.py
|
||||||
>>>>>>> UPDATED
|
>>>>>>> UPDATED
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```python
|
||||||
aider/coder.py
|
aider/coder.py
|
||||||
<<<<<<< ORIGINAL
|
<<<<<<< ORIGINAL
|
||||||
self.console.print("[red]Files are in different git repos.")
|
self.console.print("[red]Files are in different git repos.")
|
||||||
|
@ -46,7 +46,7 @@ aider/coder.py
|
||||||
>>>>>>> UPDATED
|
>>>>>>> UPDATED
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```python
|
||||||
aider/coder.py
|
aider/coder.py
|
||||||
<<<<<<< ORIGINAL
|
<<<<<<< ORIGINAL
|
||||||
self.console.print("[red]Skipped adding new files to the git repo.")
|
self.console.print("[red]Skipped adding new files to the git repo.")
|
||||||
|
@ -55,7 +55,7 @@ aider/coder.py
|
||||||
>>>>>>> UPDATED
|
>>>>>>> UPDATED
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```python
|
||||||
aider/coder.py
|
aider/coder.py
|
||||||
<<<<<<< ORIGINAL
|
<<<<<<< ORIGINAL
|
||||||
self.console.print("[red]Warning: no changes found in tracked files.")
|
self.console.print("[red]Warning: no changes found in tracked files.")
|
||||||
|
@ -64,7 +64,7 @@ aider/coder.py
|
||||||
>>>>>>> UPDATED
|
>>>>>>> UPDATED
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```python
|
||||||
aider/coder.py
|
aider/coder.py
|
||||||
<<<<<<< ORIGINAL
|
<<<<<<< ORIGINAL
|
||||||
self.console.print("[red]Malformed ORIGINAL/UPDATE blocks, retrying...")
|
self.console.print("[red]Malformed ORIGINAL/UPDATE blocks, retrying...")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue