]> andersk Git - test.git/commit
andersk / test.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1e8dea3) | patch
Make 'update' warn about merge conflicts
authorMarkus Gutschke <markus@shellinabox.com>
Wed, 8 Jul 2009 20:11:40 +0000 (20:11 +0000)
committerMarkus Gutschke <markus@shellinabox.com>
Wed, 8 Jul 2009 20:11:40 +0000 (20:11 +0000)
commit2532174a60a6e9a5a7a75c51d3a1e3c6a6a0f151
treedff4894b75347cfe7aba652f4acb556be3a93705tree
parent1e8dea376185828c9749b42e6fbfc7ca8d9223bfcommit | diff
Make 'update' warn about merge conflicts
config.h diff | blob | blame | history
configure diff | blob | blame | history
configure.ac diff | blob | blame | history
demo/vt100.js diff | blob | blame | history
libhttp/httpconnection.c diff | blob | blame | history
shellinabox/shell_in_a_box.js diff | blob | blame | history
shellinabox/vt100.js diff | blob | blame | history
update diff | blob | blame | history
Just for testing
This page took 0.036675 seconds and 5 git commands to generate.