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
merge-recursive: Fix working copy handling for rename/rename/add/add
2011-08-14
Elijah Newren
merge-r
e
cur
s
ive: Fix working
copy handling for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-r
e
cursive:
a
dd
h
a
ndling
f
or
r
e
n
a
me/rename
/
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recu
r
sive: Ha
v
e conflict_re
n
ame_delet
e
reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: Make modify/delet
e
ha
n
dling cod
e
reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive:
C
onsider modifications in re
n
am
e
/re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h
N
ewren
merge-recu
r
sive: C
r
eat
e
fu
n
c
tion for merging w
i
t
h
branchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive:
R
ecord
m
ore
data nee
d
ed
f
o
r
mer
g
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge-recursiv
e
: De
f
er re
n
ame/rena
m
e(
2
to
1
) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Small clea
n
ups
for conflict_rename_ren
a
m
e
_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wren
me
r
g
e
-recursive: Fix rename/rename(1to2) resolut
i
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
me
r
ge
-
re
c
urs
i
ve: Introduce a merg
e
_file c
o
nvenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recurs
i
v
e: F
i
x
modify/delete
r
esolution in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recu
r
siv
e
: When we
d
etect we can skip an updat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h
N
e
wren
m
e
rge-recursive: Prov
i
de m
o
re i
n
f
o
in con
f
lict
m
arker
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merg
e
-recurs
i
ve: Cleanup and cons
o
l
i
dation o
f
rename_con
f
lic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
merge-re
c
ursi
v
e: Cons
o
lid
a
te proc
e
ss_entry() and process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recursive: I
m
prove han
d
ling
o
f rename
ta
r
get
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
re
c
ursive: Add c
o
mm
e
nts ab
o
ut hand
l
ing rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
m
erge-recurs
i
ve: Make dead code for rename/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
m
e
rge-
r
ecursive
:
Fix deletion of untr
a
cked f
i
le in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-recursive: Split u
p
date
_
stages_and_entry; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
erge-recursive: Allow make_room
_
for_path() to remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-recursive: Split was_tracked() out of would_lose_u
n
tra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Save D/F
c
o
nflict fil
e
names
instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
e
rge
-
recu
r
sive: Fix code che
c
king fo
r
D/F c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
er
g
e-recursive: Fix sorting order and dire
c
t
o
ry
c
hange
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
m
e
rge-r
e
cursive
:
Fix recu
r
sive case with D/F
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Avoid working
d
irecto
r
y
chan
g
es dur
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merg
e
-recursive: Remember to
f
ree generate
d
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Co
n
s
o
lidate differen
t
update_stag
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecu
r
s
i
v
e
: Mark
s
ome dif
f
_filespec
s
tru
c
t
arg
u
m
ents
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah New
r
en
merge-recursive: C
o
rrect a
comm
e
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recurs
i
v
e
: Mak
e
BUG
m
e
s
s
age more legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Add testcase f
o
r
merging a renamed file
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6
0
2
2: New tests checking for unnecessary upd
a
tes of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Rem
o
ve unnecessary
untracked fi
l
es to make t
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cross
+ ren
a
me
/
rename(1t
o
2)/
a
dd-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t
6
036:
c
r
iss-cr
o
ss
w
/ rename/ren
a
me(1
t
o2)/modify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah
N
ewren
t6036: tests f
o
r criss-cross merges with
v
arious director
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wr
e
n
t6036: cri
s
s-cro
s
s w
i
th w
e
i
r
d c
o
n
t
ent can
f
ool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6
0
3
6: Ad
d
d
ifferently resolved modify
/
de
l
ete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h
Newren
t6042: Add f
a
iling t
e
stcases for rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042: Ensure ren
a
me/r
e
n
ame conflicts leave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ew
r
en
t
6
042
:
Add tests for conte
n
t issues wi
t
h mo
d
ify/r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t604
2
: Add
a test
c
ase where undetected re
n
ame ca
u
ses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6042: Add a pair of c
a
ses where undet
e
cted ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
re
n
t
60
4
2: Add failing testcase f
o
r
re
n
ame/modify/add-s
o
urce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah New
r
e
n
t6042
:
Add a testcase wh
e
re git delet
e
s
an
u
n
t
r
a
cked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elij
a
h Newren
Add
t
es
t
cases showing
h
ow pathsp
e
cs a
r
e han
d
l
e
d wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
E
l
ijah
Newren
Make
rev-list -
-
o
bjects wor
k
together
w
ith pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lija
h
N
e
wren
In
t
roduc
e
sane_unset and
use i
t
t
o
ensure proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah
N
e
wren
t7800 (d
i
fftool): add
mis
s
i
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601 (merge-pull-config
)
: add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t7001 (mv):
add
m
i
s
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t6016 (re
v
-li
s
t-graph-simpli
f
y
-
history): add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t56
0
2 (cl
o
ne-
r
emote-exec):
add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t
4026 (co
l
or)
:
r
e
mo
v
e u
n
n
e
eded and unchaine
d
co
m
mand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t4019 (diff-wserror
)
:
ad
d
l
o
ts of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4
2
02 (log): Replace
'
<
git
-
command> || :
'
with te
s
t_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
i
j
ah Newren
t
4
002 (diff-basic)
:
use
t
est
_
mig
h
t_
f
ail for c
o
mmands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t100[
1
2] (read-tree-m-2w
a
y,
r
ead_tree_m_u_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Ne
w
r
e
n
t4017 (d
i
f
f
-re
t
va
l
): re
p
lace manu
a
l exit code che
c
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Ne
w
r
en
t
3
020
(
l
s-
f
iles-
e
r
r
or-unm
a
t
c
h): remov
e
s
t
ray '1
'
from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recu
r
sive:
Remove redun
d
ant path cleari
n
g for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-recursi
v
e
:
Make
r
oom
for directories in D/F c
o
n
fli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
hand
l
e
_d
e
l
e
te_modify
(
)
: Check whether
D/F conf
l
icts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
li
j
ah Newren
mer
g
e_
c
ont
e
nt(): Check whether D/F conflicts are
s
till
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
conflict_
r
ename_renam
e
_1
t
o2(): F
i
x
checks for presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
co
n
f
l
ict_r
e
na
m
e_de
l
ete()
:
C
h
e
c
k whether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
r
g
e-recurs
i
ve:
D
elay modify/
d
ele
t
e conf
l
icts if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Delay content merging for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
merge-rec
u
rsiv
e
: De
l
a
y handling of rename/delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
ren
merge-recurs
i
ve: Move handling of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ija
h
Newren
m
e
rge-recursive
:
Move handling
of dou
b
le rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-r
e
curs
i
v
e
: Av
o
id doubly merging r
e
name/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
m
e
rge
-
re
c
ursive: Update mer
g
e_content() call
s
ignature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursiv
e
:
Up
d
ate c
o
nflict_
r
ename_rename_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newre
n
merge-recursiv
e
: Structure
p
r
o
cess_d
f
_en
t
r
y
() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Have
process_ent
r
y
(
)
skip D/F or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
New
r
en
merg
e
-recu
r
s
i
ve: N
e
w functi
o
n
t
o assist resolving
renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
m
e
rge
-
re
c
ursive: New
data str
u
c
t
ures
f
or d
e
ferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah N
e
wre
n
m
e
rge-recursive: Move proc
e
ss_entry
'
s content mer
g
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ij
a
h Newren
merge
-
recursive
:
Move
d
elete/modify handling
into
dedica
t
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
m
e
rge-recursive: Move rename/delete h
a
ndling into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Nuke r
e
nam
e
/dire
c
tor
y
con
f
lict
de
t
ection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive: R
e
nam
e
c
o
n
flic
t
_rena
m
e_rename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-r
e
c
u
rsive: Sm
a
ll code clarific
a
tion -
-
va
r
iable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t
6
036: Add testcase
f
o
r und
e
t
ected confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6036: Add a
s
econd
t
estcase similar
to the f
i
r
st but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Newren
t6036:
T
est index and worktree
st
a
te, n
o
t just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t6020: Add a testcase for modify/delete + directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6020: Mod
e
r
n
ize style a
b
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ij
a
h Newren
t
6022
:
Add tests for rename/rename combin
e
d with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ew
r
en
t6022: Add p
a
ired rename+D/F con
f
lict: (
t
wo/file, one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t6022: Add t
e
sts with b
o
t
h
rename
sou
r
ce & de
s
t involv
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h N
e
wre
n
t
6022:
Add
t
e
sts for re
v
ersing
o
r
der of
m
e
rg
e
s when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
t6
0
22
:
A
dd test com
b
inations of {content conflict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t6032: Add a test checking for e
x
cessive output from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
m
e
rge-recur
s
ive: D/F conflicts w
h
ere was_a_
d
ir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t
3509: Ad
d
r
e
name
+
D/F conflict testcase that recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next