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
t6046: testcases checking whether updates can be skipped in a merge
2018-05-08
Elijah Newr
e
n
t6046: testcase
s
checking wh
e
ther updates c
a
n
b
e
s
ki
p
pe
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
N
ewren
merge-
r
ecursi
v
e: avoid trigger
i
ng
add
_
c
ac
h
einfo er
r
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursi
v
e: move more is_dirty handling to mer
g
e_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
li
j
a
h
Newren
merg
e
-rec
u
rs
i
ve: i
m
prov
e
add
_
cac
h
einfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newre
n
merge-
r
e
c
ursive
:
a
v
oid spuri
o
us
r
e
n
ame/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
directory rename detection: new testcases show
c
asing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
New
r
en
m
e
rge-rec
u
rsive
:
fix rem
a
in
i
n
g
directory re
n
ame
+
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newr
e
n
merge-
r
ecu
r
sive: fix overw
r
iting dirty
files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recurs
i
v
e: avoid clobb
e
ring
un
t
racked
f
i
les wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
m
erg
e
-recursi
v
e: apply necess
a
r
y
modif
i
c
a
tions for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e
-recursive:
when compari
n
g files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-rec
u
rsive: check for file l
e
vel con
f
licts the
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newr
e
n
merge-recu
r
sive: add computa
t
ion of
colli
s
ions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
e
rge-recu
r
sive:
c
heck
f
or d
i
rect
o
ry lev
e
l c
o
nfl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recu
r
sive
:
add
get_direct
o
ry_rename
s
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newre
n
me
r
ge-recurs
i
v
e: make a hel
p
er function fo
r
cl
e
anup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
merge-
r
e
c
u
rsive: split ou
t
code fo
r
d
e
t
e
rmining dif
f
_filepair
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
merge-recursi
v
e: make !o->det
e
ct_re
n
ame codep
a
th m
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
merge-recursive: fix leak
s
of allocate
d
renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
merge
-
recursiv
e
: introduce new
f
u
n
ctions to
h
a
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
merge-recursive: move the
get
_
renam
e
s
() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
dir
e
ct
o
r
y
r
ename detec
t
ion: te
s
ts
f
o
r
h
andling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directory rename dete
c
tion: tests for
handling overwri
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Ne
w
ren
directory
r
en
a
me
d
e
tect
i
on:
misc
e
llaneous tes
t
cases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h Newren
dire
c
tory rename d
e
tecti
o
n
: testcases
e
xplorin
g
possib
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
directory
r
e
name detectio
n
: more
involved edg
e
/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wren
dire
c
tory rename detection: testcases
chec
k
ing which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
dir
e
ctory
r
ename
detection: files/director
i
es in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
wren
direc
t
ory rename detection: partia
l
ly
r
enamed
dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Newr
e
n
directo
r
y re
n
ame detection: te
s
t
cases
t
o avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
N
e
wren
di
r
ectory rename det
e
ction
:
directory spli
t
ting t
e
stcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
N
e
wr
e
n
dir
e
cto
r
y rena
m
e
d
etection:
b
a
sic
t
estcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
mer
g
e-rec
u
rsive: ensure we
w
rite upd
a
t
e
s
for
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: avoid spur
i
o
u
s
r
e
name/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h New
r
en
dir
e
ctory renam
e
detection:
new testcases show
c
asing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah Newren
mer
g
e-r
e
cursive: f
i
x remaining directory renam
e
+ dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merg
e
-
recurs
i
ve: fix overwriting dirty files
inv
o
lved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ij
a
h Newr
e
n
me
r
ge
-
recur
s
i
ve: a
v
oi
d
clobbering untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newre
n
merg
e
-
recursive: apply necessary
m
odifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
me
r
ge-recursive: w
h
en comparing files, don
'
t i
n
clu
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
merge-recursive: ch
e
c
k
for f
i
le lev
e
l
c
on
f
licts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
merge-r
e
cu
r
siv
e
: a
d
d c
o
m
putation o
f
c
o
llisions
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merg
e
-recursive:
c
heck f
o
r directo
r
y level
c
onflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
merge
-
recursi
v
e:
a
d
d
get_directory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
m
e
rge-re
c
ursi
v
e:
m
ake
a
helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-rec
u
rsiv
e
:
s
p
lit out code for determi
n
ing diff_fil
e
pairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
m
erge-recursive:
m
ak
e
!o
-
>detect_r
e
name codepath m
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge-recursive:
f
ix leaks of allocated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merg
e
-
recursive: introduce new functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merge-rec
u
rsive: mo
v
e the get_re
n
ame
s
() functi
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename detecti
o
n: tests
f
or handlin
g
overwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
director
y
rena
m
e detect
i
on:
tes
t
s for ha
n
dl
i
ng overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah New
r
en
dire
c
tory re
n
ame detection: miscell
a
neous te
s
tcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
di
r
ectory re
n
a
m
e
d
etection: testcases
e
xplo
r
i
ng possi
b
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
directory rename det
e
ction
:
m
ore in
v
olved edge/corn
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lij
a
h Ne
w
ren
di
r
ectory rename det
e
c
ti
o
n: testc
a
ses
c
h
eck
i
ng which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewre
n
director
y
r
enam
e
detection
:
f
i
les/d
i
r
ect
o
ries in th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory
ren
a
me detection: partial
l
y renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lija
h
Newren
d
irecto
r
y ren
a
me
d
etection: testcases to avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
N
e
w
ren
di
r
ectory rena
m
e dete
c
tion: directory s
p
litting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
dir
e
c
t
ory r
e
name detection: basic tes
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merg
e
-recursive: add
e
xplanation for src_
e
ntry an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newre
n
merge-recursive: f
i
x l
o
gic
o
rde
r
ing issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah N
e
wren
Tighten and correc
t
a fe
w
testcases for merg
i
ng and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah Newren
merge-recursiv
e
:
avoid incorporating un
c
o
m
mitt
e
d
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah Newre
n
mo
v
e index_has_c
h
anges() from builtin/am
.
c to merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah Newren
t6044: recursive can silently incorporate dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
l
ijah Newren
strb
u
f: remove unused stri
p
sp
a
c
e f
u
nction alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newr
e
n
merge-recu
r
sive: ignore_c
a
se shouldn't reject in
t
entio
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
El
i
j
ah Newren
sequencer: show r
e
name progress during cherr
y
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
El
i
jah Newren
di
f
f:
r
emove s
i
lent clamp of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah N
e
wren
progress: fix p
r
og
r
e
s
s meters when dealing with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
Ne
w
re
n
merge-recursive: handl
e
addition of submodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newr
e
n
seq
u
e
ncer: wa
r
n
when inte
r
nal merge m
a
y
b
e suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lija
h
New
r
en
t6044: new me
r
ge testcases
for when
i
ndex doesn't m
a
t
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-oct
o
pus: abort
i
f index does not ma
t
ch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
builti
n
/merge
.
c: f
i
x a bug with trivial
me
r
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Ne
w
re
n
t7605: add a testcase demons
t
r
ating a bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
a
h Newre
n
merge-
r
ecu
r
sive
:
d
o not check work
i
ng copy
when creat
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-recursive: remove
duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
a
h
N
e
w
ren
m
er
g
e
-
recursive: Don't re-sort
a
lis
t
whos
e
o
r
der we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newren
merge
-
r
e
cursive:
Fix v
i
r
t
ual merge base fo
r
renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
t6036:
c
ri
s
s-cros
s
+ r
e
n
a
me/r
e
name(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
merge-recu
r
s
ive: Avoid u
n
necessary file r
e
wri
t
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
22:
Additio
n
al tests che
c
kin
g
for
u
nne
c
essary u
p
d
ates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
ja
h
N
e
wren
merge-recursive: Fix sp
u
rious 'refu
s
ing to lose untrac
k
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
ren
t6022: Ad
d
test
c
ase f
o
r spurious "
r
efusin
g
t
o lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recursive: Fix working copy handli
n
g
for
r
en
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ewren
m
erge-recursive: add handling for re
n
ame/
r
ename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
re
n
merge-rec
u
rsive:
H
ave conflict_rename_de
l
ete re
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-re
c
ursiv
e
: Make mo
d
ify/d
e
lete handling code reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
merge-recursive: C
o
nsider mo
d
ific
a
t
i
o
ns in rename/r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-recursiv
e
: Create functi
o
n
f
o
r merging
w
i
th b
r
anchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merg
e
-recursive: Recor
d
more d
a
ta nee
d
ed for merg
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recu
r
sive:
D
efe
r
rename/rena
m
e(2to1) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
ren
merge-re
c
urs
i
ve: Small
c
lea
n
ups for conflict_r
e
n
ame_re
n
ame_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
m
erge-re
c
ursive: Fix
rename/rename(1
t
o2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
e
rge-recursive:
I
ntroduce a m
e
r
g
e_file convenienc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge
-
recursive: Fix mod
i
fy/delet
e
resolution in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-re
c
ur
s
i
ve: When w
e
detect w
e
can
skip
a
n u
p
date
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next