merge_tools: reorder editor_args_from_settings
#2119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
b5b160c to
befefab
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
6e3bfd3 to
d13a99e
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
befefab to
e932658
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
d13a99e to
8fd121a
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
e932658 to
18b3d7a
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
8fd121a to
aa8f576
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
18b3d7a to
b522168
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
aa8f576 to
9f8c312
Compare
martinvonz
approved these changes
Aug 23, 2023
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
b522168 to
d69c2f1
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
3 times, most recently
from
ddf1a50 to
ec1ff78
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
875c24f to
f5426d2
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
2 times, most recently
from
3e28863 to
6a50295
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
2 times, most recently
from
c2dde80 to
b604a2d
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
6a50295 to
7ca170f
Compare
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
7ca170f to
f301c6b
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
b604a2d to
7446c53
Compare
martinvonz
reviewed
Sep 17, 2023
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
f301c6b to
e14eea1
Compare
The rest of the functions in this file are defined before they are used, so it confused me when trying to track down this function in the static call graph.
arxanas
force-pushed
the
arxanas/difftool-4
branch
from
e14eea1 to
66db2da
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
If applicable:
CHANGELOG.md