summaryrefslogtreecommitdiff
path: root/doc/git-union-merge.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-11 12:58:00 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-11 12:58:00 -0400
commitaace44454a8866e8dab251c2b9c98e2d48e3f071 (patch)
treefbde4f1d7012ef2e3da239c1ad59ee4f7d1bb689 /doc/git-union-merge.mdwn
parent16d27e9c023231dcf80923d72633c80dbd91116e (diff)
keep track of the stage we're at in pairing
This avoids us responding to our own pairing messages, as well as ignoring any out of order messages that might be received somehow.
Diffstat (limited to 'doc/git-union-merge.mdwn')
0 files changed, 0 insertions, 0 deletions