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
directory rename detection: files/directories in the way of some renames
2018-02-14
Elijah Newren
d
i
rec
t
ory rena
m
e detec
t
ion: files/di
r
ecto
r
ies
i
n th
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory
rename detection:
parti
a
lly
r
e
n
amed directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direct
o
ry rename d
e
tection: testcases to avo
i
d
ta
k
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
dire
c
tory
r
e
n
ame detection: d
i
rect
o
r
y
s
plitting te
s
tcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ija
h
Newr
e
n
directory rename detection: basic testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
m
e
rge-recursive: add expla
n
ation
f
or src_entry and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
El
i
jah Newren
merge-recursive: f
i
x logic order
i
ng
issue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Tighten and corre
c
t a
few tes
t
case
s
for m
e
rging and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
merge-recu
r
s
iv
e
: avoi
d
incorp
o
rating uncommitted
c
h
a
nges
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
Newren
m
ove in
d
e
x_has_
c
ha
n
ges() fro
m
buil
t
in/
a
m
.
c to merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elija
h
Newren
t6044: recursive can silently inc
o
rporate dirty changes
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
strbuf
:
rem
o
v
e unused
s
t
ripspace f
u
nction alias
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Elijah N
e
wren
merge-rec
u
rsiv
e
: ignore_case sh
o
uldn
'
t rejec
t
intentio
n
al
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ija
h
Newren
sequencer: show rename progr
e
s
s
duri
n
g c
h
erry picks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
El
i
jah Newren
di
f
f
: r
e
move
silent clamp
o
f
renameLi
m
it
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newr
e
n
progress: fix progress meters
when de
a
li
n
g
with lots
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
ewre
n
me
r
ge-rec
u
rsive: handle addit
i
on of sub
m
o
d
ule on
our
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-14
Elija
h
Newren
sequenc
e
r: warn when
i
nternal merge may be suboptimal
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
t6044: new merge te
s
tcases for
when
index doesn't match
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge
-
octopus:
ab
o
rt if index does not match HEAD
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
bui
l
tin/merge
.
c: fix
a
bug with
t
rivial m
e
rg
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
jah Newr
e
n
t76
0
5: add a
t
estcase
demonstrating a
b
ug with tr
i
vial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-
r
ecursive: do not c
h
eck working copy when crea
t
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge
-
recursive: re
m
ove
d
uplic
a
t
e co
d
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
ewren
merge-recurs
i
ve: Don
'
t re-sor
t
a
l
i
st whose ord
e
r we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix virtual
merge b
a
se f
o
r re
n
am
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036: criss-cr
o
ss
+ renam
e
/rename(1to
2
)/add-d
e
st
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
A
v
oid unnecessary fil
e
rewrites
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022:
A
dditional t
e
s
t
s ch
e
cki
n
g for unnecessary updates
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
e
rge
-
r
ecursive: Fix sp
u
riou
s
'refusing to lose un
t
racked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
t6022: Add testcas
e
for
spurious "refusing to lose
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-re
c
ursive: Fix working cop
y
h
a
ndling for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
m
e
r
ge-rec
u
r
s
i
v
e:
a
dd
h
a
ndling for ren
a
me/rename/add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recur
s
ive: Have conflict_rename
_
dele
t
e r
e
use
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wr
e
n
merge-recursive:
Make
modify/de
l
ete handling co
d
e reusable
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cu
r
sive:
C
o
nsider mod
i
fications in rena
m
e/r
e
name
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wr
e
n
merge-r
e
c
ursive: Create f
u
nction for merging
w
ith branchname
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
e
rge-recursive: Record more da
t
a n
e
eded
for m
e
rging
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recursive: Defer rename/renam
e
(2to
1
) h
a
n
d
ling
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
e
w
ren
merge-recursive: Small c
l
e
a
nups for conflict_rename_rename_1to2
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
re
n
merge-re
c
ursive: Fix rena
m
e/rename(1
t
o2) re
s
olution
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recur
s
i
ve: Introduce a me
r
ge_file convenience
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recur
s
ive: Fix modify/delete resolution in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewr
e
n
merge-recursive:
W
h
en w
e
det
e
ct we can skip an upd
a
t
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
N
ew
r
e
n
m
er
g
e-recursi
v
e: Prov
i
de
m
o
re info in
c
on
f
lict ma
r
k
e
r
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
m
e
r
g
e-recursive: C
l
eanup an
d
consolidation
o
f rename_
c
onf
l
i
c
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
ren
merge-r
e
c
u
rsive: C
o
nsolidate process_
e
ntry() and process_df_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
merge-recursive: I
m
prove handli
n
g
of re
n
ame target
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recu
r
sive: Add
c
omments abou
t
hand
l
ing
rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-re
c
ursive: Make dead code for
rename/rename(2to1
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newr
e
n
merge-r
e
cu
r
sive: Fix deletion
o
f untracked file
i
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-re
c
u
rsive: Split u
p
date_stages_and_entry; o
n
ly
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
merge-recur
s
ive: A
l
low make_room_fo
r
_
path()
t
o r
e
move
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recu
r
sive: Split wa
s
_tracked(
)
out of would_lose_untra
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
merge-recursiv
e
: Save D/F conflict filenames instead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ewr
e
n
merge-recursive:
F
ix code checkin
g
for D/F co
n
fl
i
cts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
re
n
mer
g
e-recursive
:
Fix sorti
n
g order
a
nd d
i
r
ector
y
change
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
ren
me
r
ge-recursive: Fix recursive case with D/F
conflic
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-
r
ecursive: Avoid work
i
ng
direc
t
or
y
chang
e
s
dur
i
ng
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rg
e
-recursive: R
e
member to free
g
e
n
erated uniqu
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-rec
u
rsiv
e
: Consolidate different updat
e
_stages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wren
merge-recursive: Mark some diff_filespec
s
truct argum
e
n
ts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
ja
h
N
e
w
ren
me
r
ge-recursive: Correct a
c
omment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive:
M
ake BUG message more legible
b
y
add
i
ng
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t
6
022
:
Add testcase for
merging a rena
m
ed file with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: New tests checking for unn
e
cessa
r
y updates of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022
:
Remove un
n
ec
e
ssary u
n
t
r
acked fi
l
e
s
to
m
ake
t
est
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6036: c
r
i
s
s-cross + ren
a
me/rename(1
t
o2)/ad
d
-source
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6036: criss-cross w/ re
n
am
e
/r
e
name(1to2)/mod
i
f
y+rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Newren
t6036
:
te
s
ts for
criss-cross me
r
ges with various dir
e
ctory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6036: cris
s
-cross
w
it
h
weird cont
e
nt can
fool git
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6036:
A
d
d differently r
e
solved modify/d
e
lete conf
l
i
c
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wren
t60
4
2: Add failing testcases
f
o
r rena
m
e/rename/add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6042: Ensure re
n
a
me/re
n
ame conflicts
leave in
d
e
x
a
nd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
t
6
042: Add t
e
sts fo
r
con
t
ent
issues w
i
t
h
modif
y
/rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6042: Add a testcase whe
r
e und
e
tected rena
m
e
c
auses
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6
0
42: Add a pair
o
f ca
s
es where undet
e
cted renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add failin
g
testcase fo
r
rename/modify/ad
d
-sou
r
ce
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6042: Add a testcase
where
g
it
d
eletes an
u
ntracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newre
n
merge-recursi
v
e: When we detect we can sk
i
p an update
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-02
Eli
j
ah Ne
w
ren
t6022: New
test che
c
ki
n
g for unnecessa
r
y updates of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-02
E
l
ijah Newren
t
6022
:
New tes
t
checking for
u
nnecess
a
ry upd
a
tes of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-03
E
l
ijah N
e
w
r
e
n
A
d
d testcases showin
g
how p
a
thspecs are
h
andled with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-03
E
l
ijah
N
e
w
r
e
n
Make rev-l
i
st --obj
e
cts work together with pathspecs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
El
i
j
ah Newren
Introdu
c
e sane_
u
nset and use it to e
n
sure proper &
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
E
li
j
ah N
e
wren
t7
8
00 (dif
f
tool): add missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Ne
w
ren
t7601
(
merg
e
-pull-
c
onfig): a
d
d missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7001
(
m
v
)
:
add m
i
ssing
&&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
N
ewren
t601
6
(rev-list-
g
raph-
s
implify-his
t
o
r
y
)
:
add missi
n
g &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t56
0
2 (clone-remote-exec): add missing &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newr
e
n
t
4
026 (
c
olor): r
e
m
o
ve unneeded
and unc
h
ained command
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t4019 (diff-wser
r
or):
a
dd lots of miss
i
ng &&
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah
N
ewr
e
n
t4202
(log): R
e
pl
a
ce '<git-command> || :' with
test_might_fail
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h
N
ewr
e
n
t4
0
02
(di
f
f-basic)
:
use test_might_fail for command
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
N
ewren
t100[
1
2] (read-tree-
m
-2way, read_tree
_
m_
u
_2way): a
d
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah
N
ewren
t4017
(
diff-retval): re
p
la
c
e
m
anu
a
l ex
i
t code c
h
eck
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newren
t3
0
20
(
ls-files-error-unmatc
h
): remove stray
'1' from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-
r
ecursive:
R
emove redundant path clearing for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge
-
r
e
c
u
rsive
:
M
ake room f
o
r directories in D/F conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
handle_delete_
m
odify(): C
h
eck whe
t
her
D
/F conflict
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next