Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Ben Boeckel
rust-git-workarea
Commits
b4898058
Commit
b4898058
authored
Nov 09, 2017
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rustfmt: markup a TODO item with an issue number
parent
458474b6
Pipeline
#115490
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
src/prepare.rs
src/prepare.rs
+1
-1
No files found.
src/prepare.rs
View file @
b4898058
...
...
@@ -551,7 +551,7 @@ impl GitWorkArea {
let
(
name
,
branch
)
=
if
let
Some
((
name
,
branch_name
))
=
branch_info
{
if
branch_name
==
"."
{
// TODO: Pass the branch name we are working on down to here.
// TODO
(#6)
: Pass the branch name we are working on down to here.
debug!
(
target
:
"git.workarea"
,
"the `.` branch specifier for submodules is not supported for conflict
\
resolution"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment