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 'tg/use-git-contacts'
2018-04-09
Elijah Newren
Docu
m
entati
o
n: normalize spelling of 'no
r
malised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Docum
e
n
ta
t
i
o
n
:
f
i
x several one-character-
o
ff spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merg
e
-recur
s
i
ve: ensure w
e
writ
e
updates for direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
r
ge-re
c
ursive: a
v
oid
s
purious rename/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
d
i
rec
t
ory
r
e
name detection: new testcases
showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newr
e
n
merge-re
c
ursive:
fix remaining directory rename +
d
ir
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
N
e
wren
m
erge-
r
ecu
r
sive
:
f
i
x overwrit
i
ng dirty fil
e
s involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merg
e
-
r
ecursive: avoid clo
b
bering untra
c
ked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
ren
merg
e
-
r
ecursiv
e
:
a
pply necessary modifi
c
ations for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
a
h N
e
w
ren
merge-recursive:
when c
o
m
paring files, don't includ
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
ja
h
Newren
merge-recursiv
e
: ch
e
c
k
fo
r
file level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newr
e
n
merge-rec
u
rsive: add computatio
n
o
f collis
i
on
s
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newr
e
n
merge
-
recursive:
c
heck
f
or directory level
con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
e
w
r
en
merg
e
-recursive: add get_directory_renames
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
merge-recursive
:
make
a
h
elper function
f
or clean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
wr
e
n
merge-recursive: split
o
u
t code for de
t
ermin
i
n
g diff_filepai
r
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-re
c
u
rsive:
make !o-
>
detect_rename codepat
h
m
ore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newr
e
n
merge-r
e
cursive:
f
ix leaks
of allocated re
n
ames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wre
n
m
erge-rec
u
rsive
:
introduce new fu
n
c
tions
t
o h
a
ndle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recurs
i
ve: move the ge
t
_renames() f
u
nctio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
d
i
rectory
rena
m
e detectio
n
: te
s
ts for han
d
lin
g
overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h
Newren
d
i
rec
t
ory
renam
e
detectio
n
: te
s
ts for handling
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
directory rename detectio
n
:
m
iscellaneous
t
estcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wre
n
directory rename detection: testcases
explori
n
g
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
Newren
directory rename d
e
t
e
c
ti
o
n: more invol
v
ed
edge/
c
orner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
direc
t
ory re
n
ame detectio
n
: testc
a
ses checking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
ren
directory
rename det
e
ction:
files/directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
directory rename
detection: partia
l
ly renamed dir
e
cto
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
directory
rename detec
t
ion: testca
s
es to avoi
d
taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah New
r
e
n
d
i
rectory ren
a
m
e detection: directory spl
i
tting te
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
directory rename d
e
tecti
o
n: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
l
ijah New
r
en
merge-recursive: add expla
n
at
i
on for src_en
t
ry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah
Newr
e
n
m
erge-recursive: fix
l
ogic or
d
erin
g
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
T
i
ghte
n
a
nd correct a fe
w
testcas
e
s
for mergin
g
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h
Newren
mer
g
e-recursive: avoid
i
ncorporati
n
g
unc
o
mmitt
e
d changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah Newren
move
index
_
has_cha
n
ge
s
()
from built
i
n/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah N
e
wren
t60
4
4: rec
u
rsive can sil
e
ntly incorporat
e
dirty c
h
anges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elija
h
Newre
n
strbuf: remove unused stripspace f
u
nction ali
a
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elij
a
h Newre
n
merge-recursi
v
e: ignore_case shouldn't
reject intent
i
o
n
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah N
e
w
r
en
sequencer:
show
r
e
name progress during cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah N
e
wre
n
d
iff: remove silent cla
m
p
of renameLimi
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newr
e
n
progress: f
i
x progress me
t
ers when dea
l
ing with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
e
w
ren
merge-recursive: ha
n
d
l
e addition of su
b
module on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
E
lijah
Ne
w
r
e
n
se
q
uencer: warn
when i
n
ternal merg
e
may b
e
subopt
i
mal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t6
0
4
4
: new merge t
e
stcases for when index doesn'
t
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h
New
r
en
merge-oc
t
o
p
u
s
: abort if
in
d
ex does
not
m
atch
H
EAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
builtin/merge
.
c: fix a bug with trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ija
h
N
ewren
t
7
605: ad
d
a
tes
t
case demonstrating
a bug
with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
mer
g
e-recursive: do not check working
c
opy
w
h
en creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah
N
e
w
r
e
n
merge-recursive: remove
d
uplica
t
e code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ewren
merge-recursive:
D
on't
r
e
-sort a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
mer
g
e-recursi
v
e
:
Fix virtua
l
mer
g
e
base for r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wr
e
n
t6
0
36
:
criss-c
r
os
s
+ rena
m
e
/rename(1to2)/ad
d
-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive
:
A
v
oid unnecessar
y
fil
e
r
ewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newren
t
6
02
2
:
A
d
di
t
ional tests c
h
eck
i
ng for unneces
s
ary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recursive: Fix spurious 'refusing to lose
u
n
t
racked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newr
e
n
t6022: Add
tes
t
case for
s
pur
i
o
us "refusing to
lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Fix
w
ork
i
ng
c
opy han
d
l
ing for re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
merge-recurs
i
ve:
a
d
d hand
l
in
g
for renam
e
/
rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newren
m
e
rge-recursive:
H
ave conflict_rena
m
e_delete reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive: M
a
ke
m
odify
/
delete handling
c
o
d
e reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
merge-recu
r
sive: Co
n
sider modi
f
ications in rename/re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsive: Create function for merging
w
ith branchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-re
c
u
rsive
:
Record more
da
t
a
needed for merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
mer
g
e
-recursive: Defer
r
ename
/
rename(2t
o
1) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
ge
-
r
e
cursi
v
e: Sm
a
l
l cleanups for conflict_ren
a
me_r
e
n
a
me_1
t
o
2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsive:
Fix rename/re
n
a
me(1to2
)
re
s
olu
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
r
e
n
merge-recu
r
sive: Introduce a
me
r
ge_file convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
me
r
ge
-
recursive: Fix modify/
d
elet
e
resolution in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
merg
e
-
recursive:
W
hen
we d
e
tect we can skip an
u
pdate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Ne
w
r
en
merge-recursive:
P
rovi
d
e more info i
n
conflict markers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Cleanup and consolid
a
tion of rena
m
e_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
erge-rec
u
r
sive
:
Consolidat
e
p
rocess_entry() and
p
rocess_d
f
_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
me
r
ge
-
recursive:
I
mprove
h
andling of renam
e
tar
g
et
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Ne
w
ren
merge
-
recursive: A
d
d comments about ha
n
dling rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
g
e
-recu
r
sive: Ma
k
e de
a
d code for renam
e
/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Fix deletion of u
n
track
e
d file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h New
r
en
m
er
g
e-recursive: Split upda
t
e
_stag
e
s_and_en
t
ry; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Allow make_
r
o
om_for_path() to remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-re
c
ursive: Split
was_tracked
(
) out o
f
would
_
lose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recursive: S
a
ve D/F conf
l
ict filenames instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recurs
i
ve: Fix
c
od
e
c
h
ecking
f
or D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive: Fix sor
t
ing order and directory
c
hang
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merg
e
-recur
s
i
ve: Fix r
e
c
u
rsi
v
e cas
e
wit
h
D/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Avoid w
o
rking direc
t
ory
c
hanges d
u
ring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merge-rec
u
rsiv
e
: Remem
b
er
t
o free generate
d
u
n
ique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
merge-recur
s
iv
e
: Consolidate diff
e
rent update_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive: Mark
some diff_files
p
ec struc
t
arg
u
ments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
e
rge
-
recurs
i
ve: Corre
c
t a comm
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Make BUG message more
l
egible by a
d
ding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
N
ewren
t6022:
Add testcase for merging a
r
enam
e
d fil
e
w
i
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
t602
2
:
New tests ch
e
cking
f
or unnecessary up
d
ates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
t60
2
2
:
Remove unnecessary
untr
a
ck
e
d fi
l
e
s t
o
m
a
k
e
t
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6036: criss-cross
+
r
ename/r
e
name(1to2)/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah New
r
e
n
t
6
036: cr
i
ss-cross w/ ren
a
me/renam
e
(1to2
)
/modify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
t60
3
6:
tests for criss-cross mer
g
es
wit
h
v
a
r
iou
s
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
ja
h
Newr
e
n
t6036: cr
i
ss-cross with weird content can fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6036: Add diff
e
rently
r
esolved modify/
d
elete con
f
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t
6
042: Add failing testcase
s
for
rename/rena
m
e/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t60
4
2
:
En
s
ure rename/rename conflicts
l
eave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next