diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2011-09-27 19:54:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-27 11:25:02 -0700 |
| commit | 3c1ed90ec3973404ffcff99103faa5b863889f98 (patch) | |
| tree | 99e0dc93bd5a31ed693bfc2f3c8d44dfa5f629af /mergetools | |
| parent | ac86ec0f5e2dbd0d46fb000db1a65f1d2173a02d (diff) | |
| download | git-3c1ed90ec3973404ffcff99103faa5b863889f98.tar.gz git-3c1ed90ec3973404ffcff99103faa5b863889f98.tar.xz | |
git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
We already have a check that no new revisions are on the wiki at the
beginning of the push, but this didn't handle concurrent accesses to the
wiki.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions