Use and..or as a ternary operator rather than a dictionary
commit73e3a6fff48a84a7c109d4f6d16abb30c0104804
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Feb 2007 11:10:22 +0000 (28 11:10 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Feb 2007 11:10:22 +0000 (28 11:10 +0000)
tree2c8e3cf9473e602b35621a00afa49fa510a880b2
parentb3ae3e141a388b9c17c0abab70812dcdab512a05
Use and..or as a ternary operator rather than a dictionary

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/gitmergeonefile.py