repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: fix several one-character-off spelling errors
2018-04-09
Elijah N
e
wren
Docum
e
ntation: f
i
x several
o
n
e
-chara
c
ter-off spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
Newre
n
merge-
r
ecursive: avoid incorpor
a
ting un
c
ommit
t
e
d
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move inde
x
_has_changes()
from builtin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lij
a
h Newren
t6044:
recursive can silently incorporate d
i
r
t
y
c
hanges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
l
i
jah Newren
strbuf:
r
emove unused stripspace
function alia
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
merge-recurs
i
ve: ignore_case
shouldn't
r
e
ject int
e
ntional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
s
e
q
u
encer: sho
w
re
n
ame progress during cher
r
y
pic
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
El
i
jah Newren
di
f
f
:
remove silent clam
p
of rena
m
eLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newr
e
n
progr
e
ss: fix
p
rogre
s
s meters wh
e
n d
e
aling with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
El
i
j
a
h Newren
merge-recursive:
h
andl
e
ad
d
ition of submodule on
o
u
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah
N
ewren
sequ
e
ncer: w
a
rn when inte
r
na
l
mer
g
e
may be
suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
t
6
044: new merge testc
a
ses
for when in
d
e
x d
o
esn'
t
matc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newre
n
merg
e
-octopus: abort if ind
e
x
d
oes no
t
m
atc
h
H
EAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah N
e
wren
builtin/merge
.
c: fi
x
a bug with trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
t7605: add a testcase dem
o
nstrating
a
b
ug with tri
v
ial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-recursive: d
o
not check working copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
m
e
rge-recur
s
ive
:
r
emove d
u
plicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recur
s
ive: Don't re-sort
a list w
h
o
se
o
r
der we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
me
r
ge-recursive
:
Fi
x
virtual merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t603
6
: criss-cro
s
s +
r
ename/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
merge-r
e
cursi
v
e:
A
voi
d
unnecessary file re
w
rites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t60
2
2: Additional tests check
i
ng
fo
r
u
n
necessar
y
upda
t
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge-recursive:
F
ix spurio
u
s
'refu
s
ing
to lo
s
e
untracke
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newre
n
t6022:
A
dd testcase
for
spuri
o
us "r
e
fusing
t
o lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: F
i
x working copy
handl
i
n
g
for ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-
r
ec
u
rsi
v
e: add h
a
ndling for rename/r
e
name
/
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Have conflict_
r
en
a
m
e_dele
t
e
r
eus
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Make modify/
d
elete handlin
g
code reu
s
a
ble
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
rec
u
rsiv
e
: Consider modif
i
cati
o
ns
in rename/rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recurs
i
v
e: Create function for m
e
rging with br
a
nchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Record more data
needed
f
or merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
g
e-recursiv
e
: De
f
er
r
ename/re
n
ame(2to1)
h
andling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
N
e
wre
n
m
erge-recursive: S
m
all
clean
u
ps for conflict
_
r
e
n
ame_rename_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
e
r
g
e
-
r
e
cursiv
e
: Fix rename/rename(1to2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e: Intr
o
duce a merge_file convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-re
c
ursive: Fix modify/d
e
lete resolution in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newren
m
e
rge-
r
e
curs
i
ve:
W
he
n
we det
e
ct
we can skip an upda
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
r
e
n
merge-re
c
urs
i
v
e
: Provide
more
i
nfo i
n
c
onflict markers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive: Cleanup an
d
c
onsolidat
i
on of rename_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
urs
i
v
e
: Consolidate p
r
oce
s
s_entry() and process_df
_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newr
e
n
merge
-
recur
s
ive: Improve handli
n
g
of rename
ta
r
get
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
me
r
g
e-recursive:
A
dd comm
e
nts abo
u
t
h
an
d
ling rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
M
ake dead c
o
d
e for re
n
ame/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
m
erg
e
-recursive:
F
ix del
e
tion of
untracked
f
ile in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive
:
Spli
t
up
d
ate_stage
s
_and_entry;
onl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecurs
i
ve
:
All
o
w m
a
ke_roo
m
_fo
r
_path() to remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursi
v
e: Spli
t
was_
t
ra
c
ked()
o
ut
o
f
w
o
uld
_
l
ose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recursive: Sav
e
D/F conflict filenam
e
s
i
n
stead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e
:
F
i
x
code checking
for D/F
conf
l
ic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
mer
g
e-recu
r
sive: Fi
x
sorting order and dir
e
cto
r
y change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix recursive case
with D/F co
n
f
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erg
e
-
recursive: Avoi
d
work
i
ng
directory
changes duri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
mer
g
e-rec
u
rsive: Re
m
ember to free generated unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: Co
n
solidate
d
if
f
erent update_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Ne
w
ren
merge-recursive: Mark some diff_f
i
les
p
ec struct arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Cor
r
ect a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Make BUG m
e
ssage mor
e
legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6022: Add testcase f
o
r merging a renamed file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6022: New tests ch
e
c
king for
u
nnec
e
s
s
a
ry
u
pd
a
tes of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6022
:
Remov
e
unnecessary untrac
k
ed
fi
l
es to make te
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6036: c
r
iss-c
r
o
s
s +
r
ename
/
rena
m
e(1to
2
)/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6036:
criss
-
cross w/ re
n
a
me/renam
e
(
1
to
2
)/modify+
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6036: tests for cri
s
s-cross merg
e
s w
i
th various direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
3
6: criss-
c
r
o
ss with
w
ei
r
d
content c
a
n f
o
ol git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6036: Add d
i
fferently resolved modify/delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
re
n
t6042: Add fa
i
ling
t
estcases for rename/rename/ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t
6
042: Ensure rename/
r
ename
conflic
t
s leave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Ne
w
ren
t60
4
2: Add tests f
o
r conte
n
t
issu
e
s
wi
t
h
modif
y
/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6042: Add a test
c
ase where undetect
e
d rename ca
u
s
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042
:
Add a pair
o
f cases where und
e
tected r
e
nam
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t
6
0
4
2:
A
dd failing te
s
tcas
e
for rename/modify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newr
e
n
t6
0
4
2: Add a testc
a
s
e
where git deletes an u
n
track
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newr
e
n
merge-re
c
ur
s
ive: When we detec
t
we ca
n
skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
t
60
2
2:
New te
s
t che
c
ki
n
g f
o
r
u
nnec
e
ssary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Eli
j
ah Newren
t6022: New test check
i
ng for unnec
e
ssary updates o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elij
a
h
Ne
w
ren
Add testcases showi
n
g how pathspecs are handl
e
d with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Make rev-list --obje
c
ts work together with path
s
pecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Int
r
o
duce sane_un
s
et and use i
t
to ensure p
r
op
e
r &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7800
(
difft
o
ol): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601 (merge
-
pull
-
co
n
fig):
a
dd missing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
re
n
t
7
0
01 (m
v
):
add missing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t6
0
16 (
r
ev-list-graph
-
s
i
m
p
l
ify-hi
s
tory): add
m
issi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (c
l
one-re
m
ote-ex
e
c):
ad
d
m
i
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
t4026 (color):
r
emove u
n
ne
e
ded and
u
nchaine
d
c
o
mmand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
wren
t4019 (diff-wser
r
or):
a
dd
l
ots of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
i
jah Newren
t
4
202 (
l
og
)
: Replace '<
g
it-command> || :' with
t
est_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t400
2
(diff-basic)
:
use test_mig
h
t
_fa
i
l for commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t100[12] (read-t
r
ee-m-
2
way, read_t
r
ee_m_u_2way):
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4
0
1
7 (diff-
r
e
t
v
al)
:
replace
manu
a
l exit c
o
de ch
e
c
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newren
t3020 (ls-files-
e
rror-unmatch
)
: remo
v
e str
a
y '1' fro
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge
-
recu
r
s
i
ve: Re
m
ove re
d
undant path clearing
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recu
r
sive: Make roo
m
f
or directories in D/F confl
i
c
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
handle_de
l
ete_
m
odify():
Check wh
e
ther D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge_conten
t
(): C
h
eck wh
e
ther D/F c
o
nflicts
a
r
e
still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newre
n
conflict_rename_rename
_
1to2(): Fix
c
hecks fo
r
pres
e
nce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conflict
_
rename_delete(): Chec
k
w
hether D/F conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rg
e
-recursiv
e
: Dela
y
mod
i
f
y
/delete
conflic
t
s i
f
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive: Del
a
y content me
r
ging for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newren
merge-recursive:
De
l
ay handling
o
f
re
n
a
m
e/
d
elet
e
confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merge-re
c
urs
i
ve: Move ha
n
d
ling of doub
l
e
r
ename
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next