~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 78d1c84) | patch
Ask git about unmerged files
authorDavid Kågedal <david@virtutech.com>
Wed, 19 Dec 2007 18:00:12 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
commitd4f2b3e9bc83fd6e3063c856e3f1f203dcc5b304
treeaf5bcc6b847f34b1b4423ef3de28ccbd8432d8c3tree | snapshot (tar.gz zip)
parent78d1c847f77f3ed482574d75b682f1408cdf2002commit | diff
Ask git about unmerged files

Don't look in the "conflicts" file for that, since it isn't updated. Also
added a test that the check_conflicts() function works.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/commands/common.py diff | blob | blame | history
stgit/git.py diff | blob | blame | history
t/t0002-status.sh diff | blob | blame | history
t/t1203-push-conflict.sh diff | blob | blame | history
t/t1205-push-subdir.sh diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)