repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tb/check-crlf-for-safe-crlf'
2017-12-05
Elij
a
h
Newren
strbuf: remove unused
stripspace
function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah N
e
wre
n
merg
e
-recurs
i
ve: ignore_case should
n
't rej
e
ct intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Newren
s
equence
r
:
s
h
ow re
n
ame progress during cherry
pi
c
ks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newren
diff: re
m
ove silent c
l
amp of rename
L
imit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah
Newren
progress: fix progre
s
s meters when
dealing with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah New
r
e
n
merg
e
-recursive:
h
a
ndl
e
a
d
d
i
t
ion of sub
m
o
d
u
le on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
E
lijah New
r
e
n
sequencer: war
n
when internal me
r
g
e may be suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ija
h
Newren
t6044: new merge tes
t
cases
f
o
r w
h
e
n index
d
oesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newren
me
r
ge-o
c
topus:
a
bort if ind
e
x
does not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
b
u
i
l
tin/merge
.
c: fix a bug
w
ith trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
t7605: add a
t
estcase dem
o
nstrating a bug wi
t
h
t
rivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah
Newren
merge-
r
ecur
s
i
v
e:
do not c
h
eck working
c
o
py when cr
e
ating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
N
e
w
ren
merge
-
recursiv
e
: remove
duplic
a
te code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-re
c
ursive: Don't
re-
s
ort
a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
m
erge-recur
s
ive: Fix virtual merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t
6
0
36:
c
riss-cro
s
s + rename/r
e
n
a
me(
1
to2)/add
-
dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
me
r
ge-r
e
cursive: Avo
i
d unnecessary file rewrite
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Addit
i
o
nal tests
checking for
u
n
n
ecessar
y
u
p
d
a
tes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rg
e
-recursi
v
e: Fix spurious
'refusing
to lose untr
a
cked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6022
:
Add te
s
tcase for spurious
"
refusing to
lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
merge-r
e
cursive: F
i
x work
i
ng copy handling for rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recu
r
si
v
e
:
add han
d
l
ing for rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Ha
v
e conf
l
ict_renam
e
_delete reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
erg
e
-recursive: Make
modify/delete handli
n
g
code r
e
usab
l
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newr
e
n
m
e
rge-recursive: Consider mo
d
ifications in rename/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recur
s
ive: Cr
e
ate function for merging with br
a
nchna
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
mer
g
e
-
r
ecu
r
sive:
R
eco
r
d more data needed for mer
g
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Defer re
n
ame/renam
e
(2to1) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-re
c
ursive: Small clean
u
p
s
for conflict_rename_rename_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recur
s
ive: Fix rena
m
e/
r
e
n
ame(1to2) resolutio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-r
e
cursive:
I
ntr
o
duce a merge_fil
e
convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-r
e
c
ursive: Fix modify/de
l
ete
reso
l
ution in
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursiv
e
: Wh
e
n we
detect we can sk
i
p
a
n
update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge-recu
r
sive: Provid
e
more info in conflict ma
r
k
ers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
mer
g
e-rec
u
rsive: Clean
u
p and con
s
o
l
idation o
f
rename_con
f
lic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
e
n
merge-recursive: Cons
o
lidate process_e
n
tr
y
() a
n
d pr
o
cess_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: Imp
r
o
v
e
handling of
r
en
a
me tar
g
et
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Add com
m
e
n
t
s
about handling rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
erge-re
c
ursive:
M
ak
e
dead code for r
e
n
a
m
e
/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Fix deletion of untracked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
mer
g
e-recursive: Spl
i
t u
p
date_stages_and_entry; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
merge-recur
s
ive: All
o
w make_room_f
o
r_path(
)
to
remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
New
r
en
merge-rec
u
rsive
:
Split
w
as_tracked() out of would_lose_u
n
tra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Save D/F con
f
li
c
t filenames ins
t
e
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Fix co
d
e checking
for D
/
F conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge
-
recurs
i
ve: Fix so
r
ting
o
rder a
n
d directory
change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rg
e
-recurs
i
ve
:
Fix recur
s
ive
c
ase
w
ith D/F c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge
-
recurs
i
v
e
: Avoid working di
r
ectory changes du
r
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive: Remember to free generated un
i
que
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
m
er
g
e
-
r
ecursive:
C
onsolidate different update_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recur
s
i
ve: Mark some di
f
f_fi
l
espec str
u
c
t argument
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
r
e
n
merge-recursi
v
e
: Correc
t
a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
e
rge-recursive: Make B
U
G message more legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Add testcase for merging
a
renamed file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t602
2
: New tests ch
e
cki
n
g
for unnecessary u
p
date
s
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t
60
2
2: Re
m
ov
e
unnecessary untracked
f
il
e
s
t
o make
test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: cris
s
-cross + re
n
a
me/rename(1to
2
)/
a
dd-
s
ourc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t603
6
:
c
riss-c
r
os
s
w/
rename/rename(1to2)/modify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
t6036: tests
f
or criss-
c
ross merges wi
t
h various d
i
rectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss
-
c
ross
with
w
eird co
n
tent can
fo
o
l
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newren
t
6036: Add differe
n
tl
y
resolved
m
odi
f
y/d
e
lete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah Newren
t6042: Add failing testcases
for rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Ensure rename/ren
a
me conflicts leave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6
0
42: Add tests
f
o
r
content is
s
ue
s
wi
t
h modify/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
ren
t6042: Add a testcase where
u
ndetected renam
e
caus
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
t
6
042
:
Add a pair
o
f cases
w
h
ere
u
ndete
c
te
d
rename
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t
6
042: Add fa
i
ling
t
estc
a
se f
o
r rena
m
e/modify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newr
e
n
t6042: Add a testcase w
h
er
e
git deletes an untrack
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Eli
j
ah New
r
en
merge-recursive
:
When
we detec
t
we can skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newr
e
n
t6022: New test checking fo
r
u
n
necess
a
ry updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah
N
e
wren
t6022
:
New te
s
t checking for unn
e
cessary u
p
dates o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah New
r
en
Add testcases showing how path
s
pecs are han
d
led with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Ne
w
ren
M
a
ke rev-list --objec
t
s
w
o
r
k
toge
t
her
w
ith
pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Introduc
e
s
an
e
_unset and use
it
t
o e
n
s
ure
proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Ne
w
ren
t7
8
00 (diffto
o
l): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
re
n
t
760
1
(m
e
rge-pull-config): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t70
0
1 (mv): add mi
s
sing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
6
01
6
(
r
ev-list-graph-simplify
-
histo
r
y): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (clone-remote-ex
e
c
): add missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t402
6
(colo
r
): remove u
n
n
eeded
and unchai
n
ed command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newr
e
n
t4019 (diff-wserror)
:
add lots of missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah
N
ewren
t4202 (log): Re
p
lace
'
<
git
-
c
o
m
m
a
nd
>
|| :' with test_m
i
ght_fa
i
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4002 (diff
-
b
a
sic): use test
_
m
igh
t
_fail for commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h
New
r
en
t10
0
[12] (read-tree-m-2way, read_tree_m_u_2way
)
:
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
w
r
en
t4017 (dif
f
-retval
)
: r
e
pla
c
e manual
e
xit code ch
e
ck
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newren
t3020 (ls-files-error-unmatch): remove s
t
ray '
1
' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recu
r
sive: Rem
o
ve redund
a
nt path cleari
n
g for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
New
r
en
merge-rec
u
r
sive: Make room f
o
r
directories in D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
hand
l
e
_del
e
te_modify(): Check whether D/F
conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
_
content():
Check whet
h
e
r
D/F confli
c
ts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
confli
c
t_rename_rename_1to2(): Fix
c
hecks for
p
resence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newre
n
conf
l
ic
t
_
r
ename_dele
t
e
(): Chec
k
wh
e
ther
D
/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
r
e
n
m
erge-recursi
v
e: Delay
m
odify/de
l
ete conflicts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
ren
merge-recursive
:
D
elay
c
ontent mer
g
ing
fo
r
r
e
n
ames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
Newren
m
er
g
e-recursive: Delay handling of
r
ename/dele
t
e conf
l
ic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merge-recursive: Move
h
andli
n
g
o
f doubl
e
renam
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah N
e
wren
merge-recursi
v
e
:
M
ove handl
i
ng of double r
e
name of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
merge-recu
r
sive: Avoid doubly mergi
n
g rename/add conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
-
r
e
c
u
rsive: Update me
r
ge_content()
call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h N
e
wren
merg
e
-recursive: Update conflic
t
_
r
ename_rename
_
1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next