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
apply: fix grammar error in comment
2018-06-28
Elija
h
N
e
w
r
en
appl
y
: f
i
x grammar error in c
o
mment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
18: clarify where dir
e
ctory rena
m
e detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
R
e
l
Notes: re
m
ove d
u
plica
t
e
r
elease note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
j
a
h
Newr
e
n
t6036:
p
re
f
er test_whe
n
_finished to manual cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
e
wren
t6036, t
6
042
:
pre
f
er test_cmp to sequenc
e
s of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
New
r
en
t60
3
6, t6042: prefer te
s
t_
p
ath_is_fil
e
, te
s
t_path_
i
s_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wren
t6036
,
t6042: use test_line_count instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
i
j
ah Ne
w
ren
t6036, t6042: u
s
e t
e
st_crea
t
e_repo to keep tests in
d
ependent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elij
a
h
Newre
n
rev-parse:
c
h
e
ck
lo
o
kup'ed comm
i
t references for N
U
LL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
m
erge-recursive:
p
rov
i
de p
a
ir of `un
p
ac
k
_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
N
e
wren
merge-
r
ecursive: fix
c
h
e
ck for skipability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: m
a
ke
"
Auto-merging" comment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursi
v
e: fix re
m
ainder of was_d
i
rty()
t
o use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newr
e
n
mer
g
e-rec
u
rsive: fix
w
as_track
e
d()
t
o quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
t6046: testcases c
h
ecking whether updates can b
e
s
k
i
pped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
me
r
ge-recu
r
sive: avoid triggering add_cacheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recursive:
m
ove m
o
r
e
is_dirty h
a
n
d
ling to merge_co
n
te
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ew
r
en
merge-recursive: improve
a
dd_cacheinfo
e
rror h
a
ndli
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge-recursive: avoid spurious rename/rename co
n
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
d
i
rect
o
ry rename detection
:
new testcase
s
showcasi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-
r
e
c
u
r
sive:
fix remainin
g
directory r
e
name + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newren
me
r
g
e-recursive
:
fix overwriting dir
t
y files
i
n
v
olved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merg
e
-recursive:
avoid
cl
o
bber
i
ng untracked f
i
l
e
s with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Ne
w
r
e
n
merge-r
e
cursi
v
e: apply necessary m
o
difications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recur
s
ive: whe
n
com
p
ari
n
g
f
iles, don'
t
include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recu
r
si
v
e: check for file leve
l
con
f
licts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Ne
w
ren
merge-recursi
v
e
:
add computation of c
o
llisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
me
r
ge-re
c
ursive: check for dire
c
tory l
e
vel conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
N
ewren
me
r
ge-recursive:
a
dd get_
d
irec
t
ory_rename
s
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
lijah Newren
u
n
pac
k
_tr
e
es
:
fix
b
reakage when o->src_i
n
d
e
x != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make
r
unn
i
ng git under o
t
her de
b
ugger-like pr
o
gram
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recu
r
sive: make a h
e
lper functio
n
f
o
r cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
me
r
ge-recursive: spli
t
out
code fo
r
determin
i
ng diff_file
p
a
i
rs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
w
r
en
m
erge-recursive: m
a
ke !o->detec
t
_renam
e
codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merg
e
-recur
s
i
v
e
: fix leaks of a
l
lo
c
at
e
d
r
enames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
merge-recu
r
s
i
v
e
:
introduce
new fun
c
tions to handl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-rec
u
rsive: move
t
he
g
e
t_rena
m
es() func
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory rename detection: tests for handling overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irectory renam
e
detectio
n
: tests f
o
r handli
n
g overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
ja
h
Newren
direct
o
ry
r
e
nam
e
detection: misc
e
llaneous testca
s
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
N
e
w
ren
d
irect
o
ry rename detection: testc
a
s
es explor
i
ng possi
b
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry rename detecti
o
n: more involved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory ren
a
me
d
etection: t
e
stcases chec
k
ing which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
d
irect
o
ry
r
e
name
d
etect
i
on
:
fil
e
s/directories in
th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename
d
etection: partially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
rename d
e
t
e
ction: testc
a
se
s
to avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ew
r
e
n
directory re
n
ame
d
etection: di
r
ectory
s
plitting tes
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h Newren
dir
e
ctory
re
n
ame detection: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
ijah N
e
wr
e
n
D
o
cu
m
entat
i
on: normalize
s
pel
l
ing of
'normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
i
jah N
e
wren
Documentat
i
on: fix
s
ever
a
l one-ch
a
rac
t
e
r-off spell
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newr
e
n
merge-re
c
ursive:
ensure we
writ
e
u
p
d
ates for
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lij
a
h
N
ewren
mer
g
e-r
e
curs
i
ve:
a
void spuriou
s
ren
a
m
e
/ren
a
m
e conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
di
r
ectory rename de
t
e
c
tion:
n
e
w
tes
t
cas
e
s
showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah
Newren
merg
e
-recursive: fix remainin
g
directory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newr
e
n
m
erge-
r
ec
u
rsive: fix overwriting dirty fi
l
es involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
i
jah Newr
e
n
m
e
rge-recu
r
sive: avoid clob
b
ering untra
c
ked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
me
r
ge
-
recursive: apply necess
a
ry mod
i
fications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah N
e
wren
merg
e
-
recur
s
ive: when com
p
aring
f
i
les, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-recursiv
e
: che
c
k
f
or
f
il
e
l
e
v
el conflicts
t
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h
N
ewre
n
merge-
r
ecursi
v
e:
a
d
d co
m
puta
t
i
on of coll
i
sions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
merge-r
e
c
u
rsive: check for d
i
rectory
level c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recu
r
sive: add ge
t
_
directory_r
e
n
ames(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-rec
u
rsive:
mak
e
a
helper
functi
o
n
for c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
merge-recursive: sp
l
it
o
ut code for
d
etermining
diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge
-
recurs
i
ve: make !o-
>
d
e
te
c
t_
r
ena
m
e codepath m
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
li
j
ah Newren
merge-r
e
c
u
rsive: fix leaks of alloc
a
t
e
d renames a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merg
e
-recursive: introdu
c
e new functions
t
o ha
n
d
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive: move the get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
di
r
ect
o
r
y rename dete
c
tion:
te
s
ts for handli
n
g overwriti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
dire
c
tory
r
e
name
dete
c
tion: tests
f
o
r han
d
ling ove
r
writin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
Newren
directory
r
e
name
d
etec
t
io
n
:
miscellan
e
ous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
directory re
n
ame
d
etection:
testca
s
es expl
o
r
i
ng
possibl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
Newr
e
n
directory rename det
e
ction: mor
e
in
v
olved e
d
ge/
c
o
rner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Ne
w
ren
dire
c
tory rename
d
etection:
tes
t
c
ase
s
c
hecking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah Ne
w
ren
directory rename detection
:
f
iles/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
ah Newren
directory
re
n
a
m
e detect
i
on:
p
artially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detection
:
testcase
s
to avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory re
n
ame detection:
dir
e
ctory splitting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename
d
ete
c
tion: b
a
sic test
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
lijah N
e
wren
merge-rec
u
rsive: ad
d
explanat
i
on for src_en
t
ry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah
Newren
merge-r
e
cursive: fix l
o
gic ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ij
a
h New
r
en
T
i
ght
e
n and co
r
r
ect
a few t
e
st
c
ases for m
e
rging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
merge-recursiv
e
:
avoid incorpo
r
ating unc
o
mmitt
e
d
c
h
ange
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
N
ewren
move index_
h
as
_
changes()
f
rom built
i
n
/
a
m
.
c t
o
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lija
h
Newren
t604
4
:
recursive can silent
l
y
i
ncorporate
dirty cha
n
g
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
strbuf:
remove unused
str
i
pspace
function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elija
h
Newren
merg
e
-re
c
ursi
v
e: ign
o
re_cas
e
s
h
ouldn't
r
eject intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah Newr
e
n
sequencer:
s
ho
w
ren
a
me progre
s
s during cherry
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
Newre
n
diff: re
m
ove sile
n
t clamp of rena
m
e
Limit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Newren
p
rogres
s
: fix progres
s
meters when dealing wi
t
h lot
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
merge-re
c
ursive: han
d
l
e addition of submodule
o
n
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
seq
u
encer: warn
w
hen internal merg
e
m
ay
b
e s
u
boptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewre
n
t6044: new
merge test
c
as
e
s
for wh
e
n index doesn
'
t m
a
tc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-o
c
topus: abort i
f
ind
e
x
does not
m
atch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
builtin/merge
.
c: fix
a
bug
with t
r
i
vial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
t7605: add
a
te
s
t
c
a
se
d
em
o
nstrating a
bug w
i
th
trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
r
e
n
merge
-
re
c
u
r
sive: do not chec
k
w
orking
c
opy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
merge-r
e
cursive: remove duplicate co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Don't re-sort a list w
h
ose ord
e
r we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
merge-recur
s
ive: Fix virtual merg
e
b
ase for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next