Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: MERGE_RR droppings

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:08

Phil Hord [off-list ref] writes:
git mergetool decides to use rerere-remaining based on the existence
of the .git/MERGE_RR file:

    if test -e "$GIT_DIR/MERGE_RR"
This is correct, I would probably write it with "test -f" if I were
writing this line today, though.  After you commit to conclude the
merge, the MERGE_RR marker should disappear.  Isn't it happening for
you?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help