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
Git 2.15.2
2017-11-15
Elijah
Newren
merge-recursive: h
a
ndle addition of
s
ubmodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
t6044: new me
r
g
e testcases for when index
d
oesn't mat
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-octopus: abort if index does not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
builtin/m
e
r
g
e
.
c
: fix a bug with tri
v
ial me
r
g
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
t7605: add a testcase demo
n
strating
a bug
w
ith trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
en
merge-recursive: do not
c
h
e
ck
workin
g
c
opy whe
n
c
r
eati
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Ne
w
ren
m
e
r
ge-recu
r
s
ive: remove duplicat
e
c
o
de
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
siv
e
:
D
o
n
'
t
re-so
r
t a list
who
s
e order
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge
-
recu
r
si
v
e
:
Fix v
i
rtual merge base for
r
ena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6036: criss-cross +
r
e
n
ame/r
e
name(1to
2
)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ewren
merge
-
recursive:
A
void unnece
s
sary file rewri
t
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Additio
n
a
l
t
e
s
ts checki
n
g
f
or unne
c
essary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
ge-recursive
:
Fi
x
s
p
u
rious 'r
e
fusin
g
to lose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6
0
22: Add
testca
s
e for spurious "refusing
to l
o
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newren
m
erge-recursive: Fix working copy h
a
ndling for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: add han
d
ling f
o
r r
e
na
m
e/renam
e
/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursiv
e
: Have conflict_rename_delete re
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
ge-recursive: Make modify
/
delete handli
n
g
code reusa
b
le
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newre
n
merge-recursiv
e
: Consider mod
i
fications
in
rena
m
e/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
me
r
g
e-recursive: Cre
a
t
e
func
t
ion
for mer
g
ing with branc
h
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
r
en
merg
e
-recurs
i
ve
:
R
e
cord more data
needed for mer
g
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recursive: Defe
r
rename/
r
en
a
me(2to1) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
e
r
ge
-
recursive: Sm
a
ll cleanup
s
for confl
i
c
t_
r
e
n
ame_rename_1
t
o2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Fix ren
a
me/rename(1to2) re
s
o
l
u
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-r
e
c
u
rsive:
I
ntrod
u
ce
a me
r
ge_file convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merge-recursive
:
Fix modi
f
y/delete resol
u
tion in
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
merge-recur
s
ive: When we detect we
can skip
a
n
upd
a
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
me
r
g
e
-recursi
v
e: Provide
more in
f
o
in c
o
nf
l
ict m
a
rkers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recur
s
ive: C
l
e
a
n
u
p and c
o
nsolidation of re
n
a
m
e_confli
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recursive: Consolidate
p
r
ocess_ent
r
y() and process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Imp
r
o
ve handling of rename target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
Newre
n
merge-recu
r
s
i
ve: Add com
m
ents about ha
n
dling
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recu
r
s
i
v
e
:
M
a
ke dead code for renam
e
/
re
n
ame(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Fix
deletion o
f
untra
c
ked file
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newren
mer
g
e-recursive: Spli
t
u
p
date_stages_an
d
_e
n
tr
y
;
o
nly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
Allow mak
e
_
room_for_pa
t
h()
to
r
emove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
me
r
ge-recursive: Split was_tra
c
ked() o
u
t
of would_
l
ose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
ge-recursiv
e
: Sa
v
e D/F conflict
filena
m
es
instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Fix code checki
n
g for
D
/F
c
onflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive:
F
ix
s
orting order a
n
d di
r
ecto
r
y
c
hange
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recu
r
siv
e
: Fix
recursi
v
e case with
D/
F
conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: A
v
oid working directo
r
y
c
h
ang
e
s
d
uring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
mer
g
e-r
e
cursive: Rem
e
mb
e
r to
f
ree generat
e
d unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
mer
g
e-recursive: C
o
n
s
o
lidate differen
t
u
p
d
ate_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
en
merge-recursive:
Mark some diff_filespec struc
t
ar
g
umen
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-r
e
c
u
r
s
ive:
C
orrect
a
comm
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merg
e
-recurs
i
v
e: Mak
e
BUG messag
e
more legible
by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
6
022: Ad
d
testcas
e
f
or merging
a r
e
named file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6022: New tests checking fo
r
unnecessa
r
y updates
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
22: Remove unne
c
essary untra
c
ked
files to
make t
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Ne
w
ren
t603
6
: cr
i
ss-cr
o
s
s + rename/
r
ename(1to
2
)/a
d
d-sour
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cro
s
s
w/ rename/r
e
name(1to2)/modif
y
+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: test
s
for cri
s
s-cr
o
s
s
mer
g
es with various directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
t6036: criss-cross
with weird content can foo
l
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6036: Add differe
n
tly resolved modify/d
e
lete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
t6042: Add
f
ailing test
c
ases for rename/renam
e
/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ew
r
e
n
t
6042:
Ensure rename/rename c
o
nfl
i
c
t
s leave in
d
e
x
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wr
e
n
t6042
:
Add tests for cont
e
nt issue
s
w
ith mod
i
fy/re
n
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wren
t6
0
4
2
: Add a
testcase where und
e
tected rena
m
e c
a
uses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
t6
0
42: Add a pai
r
of cases wh
e
r
e
undete
c
te
d
rena
m
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042
:
A
dd fai
l
ing te
s
tcase for
r
ename/modify/add-so
u
rce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6042: Add
a
test
c
a
se w
h
e
re gi
t
d
e
l
etes an untra
c
ke
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
li
j
ah Newre
n
m
e
rge-recursive: When we d
e
t
e
ct we can ski
p
an
up
d
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah N
e
wren
t6022:
N
ew test checking fo
r
un
n
e
c
essary updates
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
lijah
Newre
n
t
6022:
Ne
w
test
c
hec
k
ing
f
or unnecessa
r
y updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah N
e
wren
Add testcases showing how pathspecs are
handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Make
rev-list
--objects work together
with pat
h
spec
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
Introduce sane_uns
e
t
a
n
d u
s
e it
to ensure p
r
oper
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
7800 (difftoo
l
): a
d
d
m
issing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t
7
601 (merge-
p
u
l
l-config): add mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t7001 (m
v
): add m
i
ssin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t
6016
(rev-lis
t
-g
r
aph-simplify
-
hist
o
ry): add mis
s
i
ng
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Ne
w
r
e
n
t5602 (clone-remot
e
-exec): add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
j
a
h Newren
t
4
0
26 (color):
remove unne
e
ded and unchained comma
n
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4019 (dif
f
-wserror): a
d
d lo
t
s o
f
missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Ne
w
ren
t
4202 (log): Replace '<gi
t
-command>
|| :' with test_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t4002
(diff-
b
a
si
c
):
use test_m
i
ght_fail for commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah
N
ewren
t100[12] (rea
d
-tree-m-2wa
y
, read_tree_m_u_2
w
ay): ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t4017
(d
i
ff-ret
v
al): repl
a
c
e
manual exit code
chec
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Eli
j
ah Newren
t
3
0
2
0 (ls-file
s
-
error-unmatch): remove stray
'1'
f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursi
v
e: Remove redundant path cl
e
aring
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah N
e
wre
n
me
r
ge-recursive: Make room
f
or direct
o
ries in D
/
F
conflic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
h
a
ndle_del
e
te_modi
f
y():
Chec
k
whether D/F
c
onfl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ij
a
h Newren
merge_cont
e
n
t(): Check
whether D/F c
o
nflict
s
are
s
til
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
li
j
ah New
r
en
co
n
flict_ren
a
m
e
_
rename_1to2(): Fix checks
f
or presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
c
onf
l
ict
_
r
ename_dele
t
e
(
): Check whether D/F
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merg
e
-rec
u
rsi
v
e: Dela
y
m
o
dify/delete c
o
nflicts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-re
c
ursive: Delay co
n
ten
t
merging for renam
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recu
r
sive: Delay handling of rena
m
e/delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
erge-recursiv
e
:
Move
h
andlin
g
of doubl
e
ren
a
me of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move
handling of double r
e
n
a
m
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h Newren
merge-recursi
v
e: Avoid
doub
l
y
m
e
rging
rename/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-re
c
u
r
sive: Upd
a
te merge_content() call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recursive:
U
pdat
e
conflict_rename_rename_1
t
o2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
Newren
merge-recursive
:
S
t
ructur
e
process_df_entr
y
()
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
me
r
ge-recursive: Have process_entry() sk
i
p D/F or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Ne
w
function t
o
assist resolvi
n
g renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-recursive: New data structures for
deferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Ne
w
ren
m
erge-recursive: Move process_
e
ntry's content merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
ive:
M
ove d
e
l
ete/modify handling int
o
ded
i
ca
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next